cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 04:32:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,995 Commits 8 Branches 0 Tags
a24b637de561c876eea97cb15cc77d9c75dbbe25
Commit Graph

2330 Commits

Author SHA1 Message Date
Cael_Aislinn
dba38d5508 made helmets etc properly hide hair 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-11-03 23:46:41 +10:00
Cael_Aislinn
739e965b5f Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport, removed unnecessary includes fron the .dme 
Conflicts:
	baystation12.dme

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-11-03 12:21:54 +10:00
headswe
cafd51e1a8 Merge pull request #1862 from Ravensdale/master 
(Adjusted)Adjusts items emergency lockers spawn with, AI-less borgs spawn with NT not asmimov laws
 2012-11-02 10:13:12 -07:00
headswe
8b963cad83 Merge pull request #1857 from comma/master 
Alt titles, char records & small fixes.
 2012-11-02 10:11:45 -07:00
Hawk-v3
538c57ca1c Merge pull request #1866 from Hawk-v3/master 
Removing Fatness
 2012-11-02 09:02:08 -07:00
Hawk_v3
dff741ce20 Removing Fatness. 2012-11-02 15:29:13 +00:00
Chinsky
203a4e1183 Merge branch 'disarm' 2012-11-02 01:22:31 +04:00
Head
4cd33f3906 Just uh,fixes. 
Signed-off-by: Head <sebbebroberg@hotmail.com>
 2012-11-01 17:29:02 +01:00
Hawk-v3
bdf079af85 Merge pull request #1859 from AterIgnis/dismemberment 
Fix of recent pull 'Dismamberments'
 2012-11-01 02:13:41 -07:00
Ater Ignis
0171418661 fixed my misunderstanding of this programming language 2012-11-01 12:32:14 +04:00
Chinsky
b9d942cfdd Gun goes off in random direction instead of always on assiliant. 2012-11-01 04:14:23 +04:00
Chinsky
771389f871 Added warning messages before vomiting. 
You have in total two warnings and to react now.
 2012-10-31 14:36:09 +04:00
Chinsky
e1c087c594 Added small probality of gun owner getting shot. 2012-10-31 14:34:52 +04:00
Chinsky
29fab30384 Added 40% chance of gun in active hand going off if someone tries to disarm holder. 
There is also 10% chance that gun in off hand will go off.
 2012-10-31 13:04:34 +04:00
Chinsky
a2e83e962d Alternative titles system. 
Custom character records.
Different clothing for alternative titles.
 2012-10-31 08:40:51 +04:00
Chinsky
9dc654c712 Beep boop cyborg emotes. 
All ported and working.
Ping, beep, buzz, THE LAW.
 2012-10-31 03:24:31 +04:00
Cael_Aislinn
698425a987 readd ssd sleep 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-30 23:46:54 +10:00
Cael_Aislinn
5c82c87aa2 removed silly comments 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-30 23:44:57 +10:00
Mloc
5049fa1b83 Merge pull request #1852 from comma/master 
Custom items, limbs and small fixes.
 2012-10-30 05:29:59 -07:00
Chinsky
b30ba9314c Reverted changes by 'dismemberment fix' 
It's a bit misleading, but you can just set base icon to limbless torso, so no need to subtract every missing limb from there.
Subtracting will cause mob have see-through holes when seen from the side too.
 2012-10-30 16:02:10 +04:00
Chinsky
77800a76d7 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-10-30 15:30:40 +04:00
Chinsky
a5cdbf1a1f Readded robolimbs beign affected by EMP 2012-10-30 08:07:45 +04:00
Chinsky
7e1e1872b2 Readded robolimbs and amputated limbs drawing properly. 
Now character gets proper robo and amputated limbs on spawn.
Readded checks for amputated hands.
 2012-10-30 07:59:54 +04:00
Ravensdale
7d5ee4cdf5 Fixes AI-less borgs spawning with asimov instead of corporate lawset. 2012-10-29 17:13:50 -07:00
Chinsky
6f1852449d Ported custom items system. 2012-10-30 02:27:51 +04:00
Mloc
6d350c6529 Merge pull request #1850 from comma/master 
Virus2 and small fixes.
 2012-10-29 12:29:48 -07:00
headswe
36953f7eab Merge pull request #1837 from AterIgnis/dismemberment 
Dismemberments
 2012-10-29 04:11:28 -07:00
Ater Ignis
fa1d74e435 added comments 2012-10-29 15:04:30 +04:00
Ater Ignis
6666e0cc3e fixed i=5 crutch 
I accept, that was really silly
 2012-10-29 14:35:50 +04:00
Chinsky
5281cbf2e2 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-10-29 04:28:32 +04:00
Chinsky
27eaaa01d1 Ported virus2 system and machinery. 
Viruses2 do not spawn anywhere yet, until machinery is on map.
 2012-10-29 04:27:58 +04:00
Hawk-v3
299c8d6433 Merge pull request #1848 from Hawk-v3/master 
Cryo edit. No More Alien Race Damage.
 2012-10-28 03:31:39 -07:00
Hawk_v3
b64a1cfe69 Fixed a unused area in Cryo. 
Removed damaging effects to alien players. C'mon, we whitelist them already!
 2012-10-28 10:28:12 +00:00
Hawk_v3
8e877047d9 Reverted Suit Cramping 
Hawk_v3
 2012-10-28 07:01:02 +00:00
Ater Ignis
61e16ee87f updated code to more readable 2012-10-27 19:29:48 +04:00
Cael_Aislinn
d38670f75a heavy suits cause cramps over time (minor brute damage at intervals of a few minutes), also made species clothing incompatabilities actually affect the relevant body parts 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-27 23:16:12 +10:00
Spamcat
665c840da3 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-10-26 23:57:05 +04:00
Ater Ignis
55c553f535 1) show dismemberments on player: erase limbs which are ORGAN_DESTROYED 
2) if player is husk - still try to overlay robotic limbs if they are present, but not anything else
3) human without legs can't stay, right? but he can crawl if there exist any part of arm or leg - only fully delimbed body can't move
 2012-10-25 20:00:44 +04:00
Cael_Aislinn
e8be4ac9f8 fixed kobolds (?) brought in supermatter and cleaned it up a bit 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-25 20:30:40 +10:00
Cael_Aislinn
7aee209637 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport 2012-10-25 00:35:19 +10:00
Cael_Aislinn
5bee6e1d24 ghosts have universal talk again 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-24 23:45:57 +10:00
headswe
0d98248b6f Merge pull request #1821 from comma/master 
Pain & Other Ported Things
 2012-10-23 08:47:30 -07:00
Spamcat
7183a7c3d3 Merge https://github.com/Baystation12/Baystation12 2012-10-23 17:56:00 +04:00
Chinsky
27e8b7ea50 Readded autocapitlizing said messages. 2012-10-23 12:36:26 +04:00
Spamcat
2cea1ecf7e Merge https://github.com/Baystation12/Baystation12 2012-10-22 17:55:05 +04:00
Cael_Aislinn
dd538fd3c5 Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport 
Conflicts:
	code/game/gamemodes/events.dm
	code/game/gamemodes/wizard/veilrender.dm
	code/game/jobs/job/captain.dm
	code/game/machinery/computer/HolodeckControl.dm
	code/game/objects/items/stacks/sheets/sheet_types.dm
	code/game/objects/structures/grille.dm
	code/modules/mob/living/simple_animal/life.dm
	code/setup.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-22 20:15:05 +10:00
Cael_Aislinn
9340f70252 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport 
Conflicts:
	icons/obj/items.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-22 19:35:03 +10:00
Chinsky
91b61f91e7 Readded pain and shock system. 
Tramadol and oxycodone are back too.
 2012-10-22 06:38:57 +04:00
Kortgstation@gmail.com
20ddf29dae Syndicate simple animals will now attack windows/grilles/closets/tables they come into contact with so you can't cheat and tank with them. 
Added an attackanimal to closets. Anything with wall_smash will be able to break them. This means Juggernauts can punch open closets now.

Replaced all the for mob in viewer shit with visible_message in OpTable.dm and table_racks.dm

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4933 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-22 02:26:34 +00:00
Spamcat
def7d83e0f Re-added alt satchels. 2012-10-21 23:21:40 +04:00