81a7542aa6
Merge pull request #12834 from silicons/clickcd_experimental
...
Experimental hybrid clickdelay system (No seriously I'm trying my best to not call it Minecraft attack delays)
2020-07-28 21:51:10 -05:00
ffcfd21613
fix
2020-07-27 14:24:10 -07:00
04feb3c4a5
borg
2020-07-25 03:22:48 -06:00
db24df58a0
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
2020-07-23 10:36:46 -07:00
ec72015f4f
Merge pull request #12809 from BlackMajor/borgo
...
Gripper brained. The medborg can do chemistry now, oh no.
2020-07-23 10:35:16 -07:00
ffd44b78ba
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
2020-07-23 10:26:03 -07:00
184e3992f3
fixes
2020-07-21 11:56:23 -07:00
75a2035774
Merge branch 'master' into wound-port
2020-07-21 01:10:51 +01:00
416b989e12
changes
2020-07-20 11:35:10 -07:00
98d3ac80d9
:pika:
2020-07-20 11:25:17 -07:00
1b99cb9201
everything has the bonesetter
2020-07-19 18:32:44 +01:00
974b80a2fd
Merge branch 'master' into wound-port
2020-07-18 21:45:24 +01:00
55ed77a89d
Update robot_modules.dm
2020-07-18 16:15:47 +10:00
f84b044f34
Update robot_modules.dm
2020-07-18 16:05:57 +10:00
f68962e9d3
This is a bad idea
2020-07-18 16:46:08 +12:00
7714fcfaba
more changes
2020-07-18 01:26:38 +01:00
655afda020
Merge pull request #12780 from BlackMajor/borgo
...
Even more engiborg power creep
2020-07-17 17:08:23 -07:00
fc909cd7c6
Added material sheets and tiles. This took more work than you'd think.
2020-07-17 01:17:54 +12:00
bd7c9d11d3
oh no
2020-07-16 02:02:29 +12:00
5f9364c5f8
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
2020-07-13 16:20:54 +03:00
a625d6562b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real
2020-07-08 22:02:03 -07:00
280d3de6c3
Merge remote-tracking branch 'origin/master' into TGUI-3.0
2020-07-07 18:37:45 +03:00
f5ffd7d2a9
Easing fine tuning of the system.
2020-07-03 03:00:33 +02:00
6ee1eba56c
Merge remote-tracking branch 'origin/master' into TGUI-3.0
2020-07-02 23:23:47 +03:00
20245f7319
Merge remote-tracking branch 'origin/master' into TGUI-3.0
2020-06-30 02:30:29 +03:00
9dc4b99620
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
2020-06-30 00:49:06 +02:00
c5cbfa64e5
Porting further material datum features and improvements.
2020-06-24 20:45:17 +02:00
de77b7139c
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
2020-06-23 00:13:14 +02:00
c41d2e78be
Conflicts!!!
2020-06-22 17:39:24 +03:00
2cd18f3dba
Merge pull request #12557 from silicons/life
...
Splits Life() into procs for physical and biological life processes in preparation for stasis beds
2020-06-21 18:32:58 -05:00
29a8d2ed78
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit813
2020-06-20 00:07:47 +02:00
78fadafa05
alright
2020-06-17 21:44:49 -07:00
1336404eb6
last ones
2020-06-17 21:37:19 -07:00
445d94f335
haha whew
2020-06-17 21:32:10 -07:00
ceba739231
Cooonflicts
2020-06-16 01:23:42 +03:00
923cb248d2
Merge pull request #12515 from kevinz000/roomba
...
Zoombas
2020-06-14 14:36:03 -05:00
86a07fffc3
line fix
2020-06-12 15:34:40 -07:00
f9c624ef80
based vorestation
2020-06-12 15:32:32 -07:00
bfe8ccdfb5
Merge pull request #11627 from kevinz000/combat_rework
...
"Unofficial" Combat Rework Part 3: Blocking/Parrying
2020-06-12 16:39:11 -05:00
245bf750c7
fixes a pair of dos vectors. this is apparently a day -1 patch! ( #12511 )
2020-06-12 11:54:18 -07:00
b6dc41b852
Merge remote-tracking branch 'origin/master' into TGUI-3.0
2020-06-09 11:07:39 +03:00
efddaa8cad
removes early return ( #12483 )
...
This early return, while skipping a few things, is a bad ideaas this pretty much allowed silicons to still interact with the station off-z as it 'skipped' the check for it.
2020-06-08 09:10:06 -07:00
ad6b835e8b
Linter.
2020-06-08 08:12:29 +02:00
bad809ffce
fixes
2020-06-04 19:56:06 -07:00
0b0e9011a7
Prevent surgery tools and items from being rad contaminatable ( #12413 )
...
* Update tools.dm
* Update tools.dm
* Update robot_modules.dm
2020-06-04 15:56:15 -07:00
fabfd684ce
Silicon Flavortexts. (SCRUTINISE HEAVILY) ( #12395 )
...
* Part 1 - Adding the component
* Part 2 - Making the WRITE_FILE before changing the pref menu.
* Part 3 - Mirroring existing code, instead of tacking it on because im both lazy, and want a distinction
* Part 4 - Changes the preference tab to accomodate this.
* we made a brief fucky wucky!
* make it look noice
* fuckywucky mk2
* Part 5 - make it apart of the helper list (woops)
* that'yll do it.
* maybe fix?
* nope, just hit the delete button on their flavortext entirely :agony:
* Update preferences_savefile.dm
* Update silicon.dm
* Update preferences.dm
* Update silicon.dm
2020-06-04 15:53:39 -07:00
19f215477e
Merge remote-tracking branch 'upstream/master' into TGUI-3.0
2020-05-30 18:52:02 +03:00
05fe0c7dcc
ok
2020-05-30 00:59:29 -07:00
65bb3bbb91
Merge remote-tracking branch 'citadel/master' into combat_rework
2020-05-29 19:13:22 -07:00
92a537da63
Damage fix
2020-05-29 19:12:46 -07:00
Lin