cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-24 00:52:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,353 Commits 6 Branches 0 Tags
52b51a6be47208cd80027e7ea5d4f23bc159b886
Commit Graph

19864 Commits

Author SHA1 Message Date
Daniel García Baldomir
1c67f811a7 Updated power usage of the Autholathe. 2015-03-14 20:46:41 +01:00
Daniel García Baldomir
9e464d823f Added process to robo-fabs and teleporter. 2015-03-14 20:06:52 +01:00
Techhead0
10c81f8d22 Forgot a comma. 2015-03-14 15:04:09 -04:00
Daniel García Baldomir
78798e7548 Added process on machines A to J. Changed some world iterations to machines iterations. 2015-03-14 19:45:34 +01:00
Techhead0
d4e46182af More things in belts. 
I widened the selection of things you can put in various belts. Most
notably, emergency gear in medical belts and botany gear in tool belts.
 2015-03-14 14:38:30 -04:00
Daniel García Baldomir
8e5751a632 Bodyscanner : idle 60, active 10k 2015-03-14 19:27:36 +01:00
PsiOmegaDelta
2925a296dc Merge pull request #8470 from Neerti/3-13-2015_borg_hotkeys 
Ports /tg/'s Cyborg Hotkeys
 2015-03-14 19:04:36 +01:00
mwerezak
6c794a8608 Fixes damage multiplier mixup, bumped var not being reset 2015-03-14 02:56:05 -04:00
mwerezak
e6e0c87062 Aggressive grab auto hit only applies to close targets and melee attacks 2015-03-14 01:53:11 -04:00
mwerezak
c4e4c77320 Having a neck grab on someone causes them to be hit by projectiles first instead of you. 
If however the bullet misses or passes through the person being grabbed then it continues on and may still hit the person doing the grabbing.
 2015-03-14 01:30:09 -04:00
mwerezak
812ff9869d Implements projectile point blank damage multipliers for targets being grabbed. 2015-03-14 00:41:55 -04:00
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