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
23,513 Commits 5 Branches 0 Tags
a63b9b4e73834935a3c8fc5bb038bc475cac8f13
Commit Graph

17702 Commits

Author SHA1 Message Date
Neerti
dc4d149832 Ports /tg/'s borg hotkeys. They work similarly to the AI's hotkeys. 2015-03-13 21:41:23 -04:00
mwerezak
6a5dd6c89e Aggressive grabs prevent missing with weapons 2015-03-13 21:30:18 -04:00
PsiOmega
14811d35e9 Fixes #8439. 
Appears to be the last of the major re-occuring runtimes. Good work team.
 2015-03-13 23:27:35 +01:00
Zuhayr
471ba3325e Merge pull request #8463 from comma/sstone 
Soulshard / Shade changes
 2015-03-14 01:29:52 +10:30
PsiOmega
190bff8b47 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-03-13 14:23:00 +01:00
PsiOmega
ac25b0a614 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-03-13 14:21:38 +01:00
Chinsky
ba18611bb3 Added support for multiple cloning vats per single console. 
On spawn, console will attempt to connect to all unconnected cloning vats.
You can change what console connects to which pod with multitool.
 2015-03-13 13:21:19 +03:00
Chinsky
149bf70e3e Soulstones now require victim to actually be dead or maimed, as message says, instead of just sleeping. 
Also shades now get their former icon and stuff like ghosts, for maximum spooky.
 2015-03-13 13:16:59 +03:00
PsiOmega
2efa9c78f0 Corrects pulling icon_states. 2015-03-13 11:02:18 +01:00
PsiOmega
fac4eb08e3 Alarm subsystem is now processed by the scheduler. Removes now dead code. 2015-03-13 10:36:47 +01:00
Chinsky
f03759a246 Fixes organ bioprinter and the organs. Now less debuggy and less buggy too. 2015-03-13 12:24:27 +03:00
Chinsky
a51f776f4d Cryo will now show occupant inside on sprite. 2015-03-13 12:22:08 +03:00
PsiOmega
0cc60870f5 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-03-13 09:31:03 +01:00
PsiOmega
ce30b00287 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/setup.dm
	icons/mob/items_righthand.dmi
	maps/exodus-1.dmm
	maps/exodus-5.dmm
 2015-03-13 09:23:26 +01:00
Zuhayr
100ffe4966 Merge pull request #8451 from comma/master 
Fixes #8438
 2015-03-13 17:19:36 +10:30
Chinsky
64a94a5043 Fixes #8438 
Removed spawn based on suggestion, doesn't seem to cause that graphical glitch it was against.
 2015-03-12 17:00:53 +03:00
PsiOmega
3af652fb77 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-03-12 10:30:16 +01:00
Mloc
d96e46bf10 fix sanitize_simple(), broken in #8008 
fixes OOC newlines and IRC bot crashing.

Signed-off-by: Mloc <colmohici@gmail.com>
 2015-03-11 11:39:02 +00:00
Zuhayr
e0f23aead5 Collapsed all organs into one object type. Added more interesting amputation. Added dislocation. WIP. 2015-03-11 21:17:51 +10:30
Zuhayr
b5419a1673 Merge pull request #8443 from Baystation12/master 
Master into dev-freeze.
 2015-03-11 19:37:19 +10:30
Chinsky
69a080e2d6 Merge pull request #8421 from Neerti/3_9_2015-examine-text-med 
Examine Tab Text: (Some) Medical Stuff
 2015-03-11 07:28:54 +03:00
Zuhayr
a72b94e3f8 Merge pull request #8432 from PsiOmegaDelta/WanderingNano 
Fixes #8264
 2015-03-11 08:08:04 +10:30
PsiOmega
b00138aa42 Fixes #5787. 
The pull icon is now immediately displayed/hidden when one starts/stops pulling an objects.
Not stolen from https://github.com/tgstation/-tg-station/pull/8279.
 2015-03-10 18:01:27 +01:00
Neerti
e07f06d7f4 I shouldn't proofread when sleep deprived. 2015-03-10 10:55:14 -04:00
PsiOmega
373921fa44 Fixes #8264. 
updateUsrDialog() doesn't play well with nanoUI, forcing it to re-open and reposition on each cal.
 2015-03-10 14:06:05 +01:00
PsiOmega
533ccef0ab Robot code clean up and fixes. 
Fixes runtime when a borg is reset.
Fixes issue where /proc/select_active_ai_with_fewest_borgs() would not always return the intended AI.
Fixes issues with new borgs spamming the master AI with creation messages under some circumstances.
 2015-03-10 13:37:20 +01:00
PsiOmega
d3d9e0b2ed Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-03-10 12:48:27 +01:00
PsiOmegaDelta
ff11ae9d54 Merge pull request #8426 from mwerezak/misc 
Penetrating bullets are now more likely to go through glass doors
 2015-03-10 09:26:11 +01:00
Zuhayr
fce1168fd7 Merge pull request #8427 from PsiOmegaDelta/HydroRuntime 
Fixes hydroponics update_icon() runtime.
 2015-03-10 18:54:41 +10:30
Zuhayr
34c015cbbe Merge pull request #8424 from mwerezak/exosuit 
Allows removing exosuit pilots using maintenance protocols
 2015-03-10 18:54:07 +10:30
PsiOmega
9fdd3ccbdf Can now destroy/delete the suit cycler. 2015-03-10 09:08:52 +01:00
PsiOmega
a86c16b3e3 Fixes hydroponics update_icon() runtime. 
Rounding could cause plant maturation to have a value of 0.
 2015-03-10 08:16:20 +01:00
mwerezak
65a34943cd Penetrating bullets are now more likely to go through glass doors 2015-03-10 03:00:24 -04:00
PsiOmega
85641b46e5 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-03-10 07:58:25 +01:00
mwerezak
3de6374b4a Allows unconscious/dead exosuit pilots to be removed if maintenance protocols are enabled. 
Enable maintenance protocols -> wrench -> crowbar -> multitool.
 2015-03-10 02:47:54 -04:00
PsiOmegaDelta
56516d1ec5 Merge pull request #8419 from mwerezak/blazer 
Adds custom item for Von2531
 2015-03-10 07:11:18 +01:00
Chinsky
9c30024ca0 Merge pull request #8411 from volas/admin_stuff 
Some admin stuff
 2015-03-10 09:09:35 +03:00
Chinsky
dc4b02ceb2 Merge pull request #8399 from PsiOmegaDelta/CrySplosion 
Fixes #8398.
 2015-03-10 09:08:58 +03:00
Neerti
be0971e690 Adds sabiram's help text to the game. 2015-03-09 23:19:15 -04:00
Zuhayr
277ceea894 Merge pull request #8405 from PsiOmegaDelta/StationAlertRuntime 
Station Alert Runtime Fix
 2015-03-10 09:30:57 +10:30
Zuhayr
fb56784fcb Merge pull request #8408 from mwerezak/examine-fix 
Examine fix
 2015-03-10 09:30:51 +10:30
Zuhayr
00976aea43 Merge pull request #8417 from PsiOmegaDelta/SolidMatter 
Attemps to fix #8390 + solid bonus
 2015-03-10 09:29:04 +10:30
Zuhayr
fc985c2a27 Merge pull request #8416 from PsiOmegaDelta/Ninjas 
Fixes ninja spawn logic.
 2015-03-10 09:27:11 +10:30
mwerezak
1150902c9f Adds custom item for Von2531 
Blue blazer loadout item
 2015-03-09 16:57:10 -04:00
Daniel García Baldomir
2fa6bb9ab2 Fixes mass driver not being registered on machines. 2015-03-09 21:54:38 +01:00
Chinsky
7a066b3c69 Merge pull request #8418 from mwerezak/supply-pack 
More tweaks
 2015-03-09 23:28:15 +03:00
PsiOmegaDelta
78d67a717a Merge pull request #8384 from comma/spookycat 
Gave Runtime spirit-sensing capabilities.
 2015-03-09 21:17:23 +01:00
PsiOmegaDelta
d2ab1713ee Merge pull request #8383 from comma/timetravel 
Randomized roundstart hour
 2015-03-09 21:17:11 +01:00
PsiOmegaDelta
668c4baee7 Merge pull request #8382 from comma/monkey_revenge 
Allows you to scoop monkeys up
 2015-03-09 21:17:03 +01:00
mwerezak
645910947b Adds orderable flaregun crate 
Mainly to make double-barrelled shotguns orderable.
 2015-03-09 16:00:49 -04:00