cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-08 00:21:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,092 Commits 26 Branches 2 Tags
95181d96a8935095ecff839e1ec503a2a614d2ce
Commit Graph

2352 Commits

Author SHA1 Message Date
cib
95181d96a8 Several fixes to germs. 2012-11-12 13:17:11 +01:00
cib
e92cecdefe Added basic germ code. 
This will only trigger in surgery for now - That is when you cut someone open in surgery, you'd better wash your hands before, or otherwise you'll get infected wounds.
 2012-11-12 12:51:28 +01:00
Mloc
ba3a9d37b2 Merge pull request #1916 from Kreastr/master 
Setting proper gliding_size for mobs and objects.
 2012-11-11 14:01:46 -08:00
SkyMarshal
ecdb9ab118 Fixed the sillies marked with "skytodo". Removed ONESIZEFITSALL flag as we removed fatness, replaced it with PLASMAGUARD flag as that is what we were using the value as previously. Firedoors should no longer be derpy. The remaining "skytodo"s are places where I have no idea what the fuck you wanted or no idea what the fuck needed done with it. 2012-11-11 14:33:33 -07:00
Kreastr
9ddc1d02d9 Merge branch 'master' of git://github.com/Baystation12/Baystation12 
Conflicts:
	code/modules/mob/mob_defines.dm
 2012-11-11 16:43:28 +02:00
Kreastr
0fe02fcd27 More clean up 2012-11-11 14:39:22 +02:00
Ravensdale
8cc22cbb15 Adjusts AI code to bring back custom cores and makes it easier to add in more. 2012-11-10 21:42:30 -08:00
Mloc
35132b3036 Merge pull request #1901 from AterIgnis/hud_intent_better 
all-intents-intent-button
 2012-11-10 08:58:39 -08:00
Ater Ignis
20bdba6c67 all-intents-intent-button 
shows all possible intents on intent button and allows choosing needed one directly, without scrolling them all
 2012-11-10 14:19:02 +04:00
Ater Ignis
8b71b7d106 updated DNA code to have more mutations 2012-11-10 14:12:25 +04:00
SkyMarshal
1eb2ceb643 Removed the /TG/ "feature" which has explosions insta-gib dead people. THIS IS WHY I HATE THE MERGE. 2012-11-09 22:30:38 -07:00
Ater Ignis
af0593e07b Chemistry on child reagents and in mobs 
Ethanol childs (most drinks in general) are treated as ethanol in reactions
Reactions are going inside mobs, but not make bubbling effect
 2012-11-09 20:53:20 +04:00
Cael_Aislinn
6f77899396 should invert SSD to apply to normal disconnects, but not ghosting admins 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-11-08 22:20:34 +10:00
Kreastr
2e8b305ac3 Now gliding_size for pulled objects and mobs is also changed. 2012-11-07 13:13:45 +02:00
Kreastr
484351a200 Adapting glide size formula 2012-11-07 11:51:44 +02:00
Kreastr
cf01509f8e Split speed from actual delay time 2012-11-07 11:23:45 +02:00
Kreastr
2a80909a94 Making it work 2012-11-07 11:16:28 +02:00
Kreastr
f82952d347 Fixes 2012-11-07 01:39:56 +02:00
Kreastr
001ea33ce0 Merge branch 'animation' 
Merging animation fixes

Conflicts:
	baystation12.dme
	code/defines/obj.dm
	code/modules/mob/mob_defines.dm
	code/modules/mob/mob_movement.dm
	config/admins.txt
 2012-11-07 01:38:28 +02:00
Kreastr
2deb70a1a9 Some changes. Untested. 2012-11-07 00:08:02 +02:00
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