cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,960 Commits 5 Branches 0 Tags
2619fb61ce378e8a152f0b55d8c30d7620aea6bd
Commit Graph

14127 Commits

Author SHA1 Message Date
Zuhayr
2619fb61ce Merge pull request #5872 from PsiOmegaDelta/Manifest 
Fixes #5867
 2014-08-03 12:57:19 +09:30
Mloc
e2ea86eab1 Merge pull request #5699 from Zuhayr/calamity 
Calamity mode.
 2014-08-02 11:39:29 +01:00
Zuhayr
9eed4422ff Lowercasing some Del() calls. 2014-08-02 00:15:49 +09:30
Zuhayr
96c7012608 Fixed part of the ninja objective. 2014-08-01 23:54:38 +09:30
Zuhayr
0868c344cc Adjustments and a typo fix. 2014-08-01 23:50:33 +09:30
Mloc
457d76f441 Merge pull request #5834 from Zuhayr/hydroponics 
Changes dev hydro to use reagent procs.
 2014-08-01 15:01:52 +01:00
Zuhayr
2493dedf4b Merge pull request #5847 from MrSnapwalk/psychotailor 
Psychiatrist/Psychologist update
 2014-08-01 21:59:10 +09:30
Zuhayr
1376a827d6 Merge pull request #5833 from Jarcolr/customs 
Adds *6* approved custom items and updates a custom item
 2014-08-01 21:57:33 +09:30
PsiOmega
8104928e75 Creates a shared proc for applying AI verbs. DRY. Arranges some consistency among verbs. 
Fixes #5867 as well as a couple other missing verbs.
 2014-08-01 10:36:44 +02:00
Zuhayr
202398d0e2 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-07-31 23:08:14 +09:30
Jarcolr
1e90a5b218 Adds Raptor1628's hazard hardsuit 
http://baystation12.net/forums/viewtopic.php?f=33&t=10888
 2014-07-31 10:44:34 +03:00
MrSnapwalk
84ceb30d27 Psychiatrist/Psychologist update. 2014-07-30 20:57:20 -05:00
Rob Nelson
68a13a6d60 Vending machine href exploit fix 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/vending.dm
 2014-07-30 21:47:29 +01:00
Jarcolr
e1267b7fdf Adds Supercotton's welding mask 
http://baystation12.net/forums/viewtopic.php?f=33&t=10768
 2014-07-30 21:20:33 +03:00
Chinsky
e69e6d8946 Merge pull request #5822 from mwerezak/sounds 
Sound fixes
 2014-07-30 21:12:34 +04:00
Chinsky
9c2baaa479 Merge pull request #5831 from PsiOmegaDelta/Pics 
Synth camera
 2014-07-30 21:11:14 +04:00
Zuhayr
70fe00e1c1 Updated borer icons slightly. 2014-07-30 21:51:17 +09:30
Zuhayr
f2393d9465 Replaces antag intro text and objective announcement with a proc. 2014-07-30 21:36:31 +09:30
Zuhayr
e885fc8115 Added Calamity mode. 2014-07-30 21:09:25 +09:30
Zuhayr
dac4e3432e Adjusted borer spawns/options/vars. 2014-07-30 21:08:54 +09:30
Zuhayr
3105297f3e Adjusted spawn procs for heist and nuke. 2014-07-30 21:08:28 +09:30
Zuhayr
fcd1c73b17 Adjusted gas exude code. 2014-07-30 20:54:36 +09:30
PsiOmega
b9537adfef Adds proximity check to prevent telekinetic taping of doors. 2014-07-30 10:22:50 +02:00
Zuhayr
e2e039f72a Adjusted process_reagents() so hydro trays are refillable with water and nurients when the tray is dead/empty. 2014-07-30 12:39:28 +09:30
Zuhayr
ca59536e06 Reapplying some fixes that I think DM may have saved over, whoops. 2014-07-30 12:34:36 +09:30
Zuhayr
251b44a53c Changed hydro trays, fertilizer and syringes over to use the reagent procs. 2014-07-30 12:24:03 +09:30
Jarcolr
bd4d07c18a Adds 2 approved custom items to code 
http://baystation12.net/forums/viewtopic.php?f=33&t=10949
http://baystation12.net/forums/viewtopic.php?f=33&t=10894
 2014-07-29 22:08:32 +03:00
Jarcolr
5b77883f36 Adds 2 approved custom items and update 
http://baystation12.net/forums/viewtopic.php?f=33&t=10952 for update
http://baystation12.net/forums/viewtopic.php?f=33&t=10850 for
Cataguette's item
http://baystation12.net/forums/viewtopic.php?f=33&t=10527 for Yankee's
item
 2014-07-29 21:04:41 +03:00
PsiOmega
3ad8f4ca24 Merge branch 'dev' into Pics 
Conflicts:
	code/modules/paperwork/photography.dm
 2014-07-29 16:45:55 +02:00
Chinsky
fcdca5ca5b Merge pull request #5832 from Baystation12/master 
master - > dev
 2014-07-29 18:37:19 +04:00
Chinsky
1150331bc4 Merge pull request #5828 from mwerezak/wound-infections 
Fixes chest not being coloured by necrosis
 2014-07-29 18:13:02 +04:00
Chinsky
8ccac61068 Merge pull request #5820 from Zuhayr/hydroponics 
Bevy of newhydro fixes.
 2014-07-29 17:59:28 +04:00
Chinsky
bf686a6401 Merge pull request #5815 from PsiOmegaDelta/Mecha 
An Odysseus with patients now bypass mech movement-overrides.
 2014-07-29 17:58:18 +04:00
Chinsky
4d8db295d8 Merge pull request #5814 from JimTheCactus/polaroid 
Improves Polaroid Camera Images
 2014-07-29 17:57:41 +04:00
PsiOmega
2f8bb7e135 Fixes runtime errors. AIs and cyborgs can now attach their photos to newscasters as well as photocopy them. 2014-07-29 15:45:22 +02:00
Zuhayr
89be9e5f43 More adjustments. Implemented gas exuding/consumption (currently unused). Implemented cuttings, fixed some issues. 2014-07-29 13:24:52 +09:30
Zuhayr
7b084ed349 Fixed diona pods being mutable, fixed a few other tweaks, added cuttings. 2014-07-29 12:38:21 +09:30
mwerezak
9680cd85b7 Fixes chest not being coloured by necrosis 2014-07-28 20:51:04 -04:00
PsiOmega
a5f6d417a1 Expands the AI photo-camera so that it now has robot/cyborg support. Also implements DRY in practice. 2014-07-28 23:41:55 +02:00
JimTheCactus
f5df1acaaa Added handler for pixel stepping 2014-07-28 13:05:29 -06:00
JimTheCactus
6b1f696203 Ported multi-turf behavior 
This allows for layering that moves across tiles and enables alternate methods of enumerating the tile list (not used at present.)
 2014-07-28 12:44:42 -06:00
JimTheCactus
f0594b6e21 Made camera render turf effects. 2014-07-28 12:10:21 -06:00
mwerezak
e104647404 Sound fixes 2014-07-28 14:09:16 -04:00
JimTheCactus
df3fcbc9b2 Ported nearest-neighbor scaling from TG 2014-07-28 11:54:01 -06:00
PsiOmega
63ab44accc Makes it possible for the AI to take and view images. 2014-07-28 17:30:51 +02:00
Zuhayr
7f6b36e1dc Fixes some transposed values. 2014-07-29 00:25:46 +09:30
Zuhayr
f8e50b28f5 Bevy of newhydro fixes. 2014-07-29 00:20:38 +09:30
Mloc
f7cfe55867 Merge pull request #5816 from Loganbacca/trainfix 
More train fixes
 2014-07-28 12:45:00 +01:00
Mloc
ec22ba6060 Merge pull request #5817 from PsiOmegaDelta/AI 
AI alt-click fix
 2014-07-28 12:44:32 +01:00
Mloc
7b4382977b Merge pull request #5813 from PsiOmegaDelta/Shuttle 
Fixes #5810
 2014-07-28 12:42:58 +01:00