cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-31 16:06:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
10,070 Commits 66 Branches 25 Tags
2faf9c7a9c368a5fb56a75e2d7f5c8a24812e4d1
Commit Graph
4211 Commits
Author SHA1 Message Date
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
cib 2522d5e7f1 Fixed up autoinjectors and added health analyzer to regular first aid. 2012-11-11 11:45:24 +01:00
SkyMarshal bb3f533fb1 Merge pull request #1912 from Ravensdale/master 
AI custom sprites: Re-introducing three and adding in my own.
 2012-11-10 21:54:42 -08: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
RawrTaicho f97f887458 Annnnnnnd another custom item: http://baystation12.net/forums/viewtopic.php?f=33&t=5413 2012-11-11 00:13:43 +00:00
RawrTaicho 864dbe8a84 http://baystation12.net/forums/viewtopic.php?f=33&t=5837 2012-11-10 23:43:24 +00:00
RawrTaicho fde3147c5c - http://baystation12.net/forums/viewtopic.php?f=33&t=5801 2012-11-10 22:57:09 +00: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
Ater Ignis 116b17e2be internal explosions 
if some explosive reaction occurs - it firstly tries to explode container, next the surroundings
if container is alive - it cuts half of explosion power, if it is dead in process - cut an half again
 2012-11-09 20:24:44 +04:00
Hawk-v3 c4c065dfba Merge pull request #1885 from caelaislinn/bs12_with_tgport 
remaining map updates, plus misc
 2012-11-09 06:49:39 -08: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
Chinsky c55e290d4b updated configs on MLoc's request. 
Swapped loading mods and loading admins  in places during worldstart, so former mods will properly adminned.
Fixed paths for custom items.
 2012-11-07 20:35:02 +04: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
Chinsky 9dc9198237 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-11-06 22:41:19 +04:00
Chinsky 1a02f2ff1c Proted instabeams for energy projectiles. 
Also buffed laser damage to pre-merge.
 2012-11-06 20:35:48 +04:00
SkyMarshal f66572b6a7 Merge pull request #1879 from comma/master 
Photos and flying batons
 2012-11-06 00:26:00 -08:00
cib 392bdd022f Removed the ability to create vira. 
This ability should return when virus2 is ported fully and the machinery is added to the map.

This also fixes a possible exploit where you can supply a fake href and spawn a singularity instead of a virus(luckily it won't be added to the map though, but you can still trigger any New() proc you want)
 2012-11-05 19:49:30 +01:00
Hawk-v3 4a5c446191 Merge pull request #1875 from SkyMarshal/bugfixes 
Fixed Security HUD issues, reinstated old grenade behavior, de-nerfed Polyacid (now guarantees melted helmet, no other changes.)
 2012-11-05 01:32:47 -08:00
Asanadas c49538aa8b I am ashamed 2012-11-04 21:35:49 -05:00
Asanadas 49adb9e5cb Anti-Rev removal compile fix. 2012-11-04 21:15:01 -05:00
SkyMarshal 70c2fb231d Fixed Security HUD issues, reinstated old grenade behavior, de-nerfed Polyacid 2012-11-04 16:17:35 -07:00
Chinsky 6256200c1a Added ability to clip photos to clipboards. 
Added ability to view photos from clipboards and folders.
 2012-11-04 21:03:17 +04:00
headswe 1ab78f1ef9 Merge pull request #1873 from caelaislinn/bs12_with_tgport 
retrack detective files
 2012-11-04 07:19:25 -08:00
Cael_Aislinn 9955852ab9 retrack detective files 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-11-05 01:16:21 +10:00
Hawk-v3 93ca65d2ca Merge pull request #1858 from caelaislinn/bs12_with_tgport 
Miscellaneous things
 2012-11-03 09:04:59 -07: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
Hawk-v3 cd641c3370 Merge pull request #1861 from AterIgnis/detonators 
Detonators
 2012-11-03 04:31:16 -07: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
Ater Ignis cbc31b9090 Adjustable timer for default grenades 2012-11-01 21:05:02 +04:00
Head 4cd33f3906 Just uh,fixes. 
Signed-off-by: Head <sebbebroberg@hotmail.com>
 2012-11-01 17:29:02 +01:00
Ater Ignis e79df68ef3 added new assembled timer-igniter assembly and added that to default chem-grenades 2012-11-01 17:49:21 +04: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