cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,008 Commits 5 Branches 0 Tags
0fe02fcd27604f6321c4a8b8d985e2a434f3d1c0
Commit Graph

7689 Commits

Author SHA1 Message Date
Kreastr
0fe02fcd27 More clean up 2012-11-11 14:39:22 +02: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
bd6a7ec86b Merge fixes part2 2012-11-07 11:13:27 +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
a02a337fed Added option to call crew transfer to Comms computers. 2012-11-06 22:38:02 +04:00
Chinsky
b10b035552 Changed Command Channel color to more visible one. 2012-11-06 21:23:58 +04:00
Chinsky
1a02f2ff1c Proted instabeams for energy projectiles. 
Also buffed laser damage to pre-merge.
 2012-11-06 20:35:48 +04:00
Chinsky
4a9c7b82ae Commented out gibbing when torso takes too much damage. Because no one likes when you gib someone by poking knife in their chest enough times. 2012-11-06 16:37:16 +04:00
Chinsky
5276c85664 medical belts can hold gloves and mask again. 2012-11-06 14:11:31 +04:00
Chinsky
9a4535be69 Added logging of thrower for stunbatons. 2012-11-06 13:29:01 +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
Chinsky
5d62b98c18 Added 50% chance of thrown baton to stun mob 2012-11-05 14:46:00 +04: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
Chinsky
22545ebb9c Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-11-04 19:20:22 +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
Cael_Aislinn
12d4aed285 added anomaly /area icon_state, fixed anomaly research outpost and shuttle, added cycling airlocks to engineering singularity access (slight reshuffle of engineering areas) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-11-04 16:42:32 +10:00
Chinsky
45a6cd0d00 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-11-04 10:03:45 +04:00
Chinsky
d42f601308 Ported photo system. 2012-11-04 09:53:38 +04: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
Chinsky
d56b400b0c Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-11-03 12:03:46 +04:00
Cael_Aislinn
4a5a80f3bb fixed alien whitelist (wasn't being loaded at round start), removed myself from admins 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-11-03 16:57:59 +10:00
Chinsky
4e6a77edb4 Stopped cig butts falling out of mouths. 2012-11-03 10:37:30 +04:00
Chinsky
946645175e TG fix for voting window not going away. 
Thanks elly1!
 2012-11-03 08:04:47 +04: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
9fdbf5006a Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-11-02 04:49:52 +04:00
Ravensdale
19bca3e2ef Update code/game/objects/structures/crates_lockers/closets/utility_closets.dm 2012-11-01 15:43:09 -07:00
Chinsky
7783ee2fbb Commented out Honker weapons. 2012-11-02 01:40:12 +04: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