4f734f68a9
moves damage checks
...
title. Makes it harder to circumvent them.
2020-10-11 16:18:25 +02:00
4146566af0
hoo boy
...
replaces all mentions of bodypart_robotic with is_robotic_limb() where possible, adds BODYPART_HYBRID, adds helpers for organic / robotic limbs (is_robotic_limb() / is_organic_limb(), with a arg to override it accepting hybrid limbs)
Also makes the the surgery to heal robotic limbs work if the torso isn't a robot, but rather if there are robotic bodyparts, makes the IPC brain repair.. only accept IPC brains (obviously), makes the damage threshholds for robo-limbs vars instead of a fix 25 with hybrid ones predefined at 25 / 15 (trigger / mindamage), adds an error message to fixing them if already at theshhold, etc. Now just for replacing BODYPART_ORGANIC with is_organic_limb aswell where applicable.. also actual values for the other robo limbs. Fun!
2020-10-06 17:34:13 +02:00
125b50d392
Merge branch 'master' into cool-ipcs
2020-09-16 05:09:02 +01:00
98d3ac80d9
:pika:
2020-07-20 11:25:17 -07:00
6ee63f66aa
whew
2020-07-07 20:48:54 -07: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
0d197e82f8
Merge branch 'master' into cool-ipcs
2020-06-19 01:57:02 +01:00
8cb15f9279
Actually Balanced and Standardized Vendor Prices. ( #12495 )
2020-06-09 22:22:53 -07:00
6ad72e6972
better limb healing
2020-06-05 15:41:52 +01:00
a84e7bcecc
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
2020-05-24 04:00:51 +02:00
335f5a37b9
Plane adjustments on several low layer objects. ( #12286 )
2020-05-17 17:02:57 -07:00
30ab79e09e
Porting the twohanded component.
2020-05-17 18:16:53 +02:00
7fb96ab0cf
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685
2020-05-12 20:06:59 +02:00
60bdbfaf61
Merge conflicts, procs instead of macros, mood signals.
2020-05-08 02:12:41 +02:00
5c5fc37959
Introducing noitatsxoB ( #12073 )
...
* okay
* ok
* ok
* ok
* ok
* why am i doing this
* WHY DID I DO THIS
* mirror doesn't work
* compile
* shuttles should work
* fix engine
* fix engine
* off by 1
* ok
* adds proccall to write next map
* haha post processing funny
* fixes
* Update code/modules/mapping/map_template.dm
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com >
* Update code/modules/mapping/map_template.dm
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com >
* Update code/modules/mapping/map_template.dm
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com >
* Update code/modules/mapping/map_template.dm
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com >
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-05-06 17:50:50 +02:00
001109cfcd
About ready.
2020-05-05 20:58:44 +02:00
643ef48f0e
Macros, generic skill implementations.
2020-05-05 04:42:34 +02:00
a194d7dafe
merge conflict and job/dept discounts support.
2020-05-03 02:11:05 +02:00
94f014589d
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685
2020-04-25 17:09:34 +02:00
89e5681593
Fixing robo limb burn damage being unfixable.
2020-04-24 18:33:54 +02:00
42201343a9
Backward 512 compatibility removal.
2020-04-23 00:59:23 +02:00
c93f028a97
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685
2020-04-21 01:53:41 +02:00
bbd038bba6
Ghommies suggestion
2020-04-18 14:06:38 +03:00
4c6f1b622b
Porting Goofconomy & co.
2020-04-17 07:48:11 +02:00
75dab9fa57
And some other fixes
2020-04-16 10:51:17 +03:00
0a234d5618
TABS NOT SPACES
...
AAAAAAAA
2020-04-09 09:32:23 +03:00
75a2dd6900
Finnishing touches, hopefully
...
Tweaks some indendation
2020-04-08 18:32:45 +03:00
3cf6524389
Makes it nicer, removes check_cable_amount
...
Putnam suggested this as well
2020-04-08 18:28:35 +03:00
cdd2f55cac
Putnams suggestion
...
Makes use() a if, as to use it as a further sanity check
Co-Authored-By: Putnam3145 <putnam3145@gmail.com >
2020-04-08 18:24:14 +03:00
c9ab705c80
Ghommies suggestion
2020-04-07 16:08:38 +03:00
c4ff1cd322
Coding is hard, mkay?
2020-04-07 14:39:00 +03:00
598179553e
Changes making cablecuffs to using cable in your hand, instead of a menu. ( #11702 )
...
* There we go
* Ghommie suggestions
2020-04-03 18:34:26 +02:00
59b1a223a3
Ok, done.
2020-03-08 22:51:36 +01:00
a726f09201
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
2020-02-04 03:54:52 +01:00
95db5084ab
Screw commit history.
2020-02-02 01:26:04 +01:00
7f14fa3c71
not-so-wip now.
2020-01-31 19:20:59 +01:00
512b112154
happythink
2020-01-15 20:45:05 -07:00
16a37e2769
Standardises all files from CRLF to LF
2020-01-12 14:28:01 +00:00
b4c0433d6d
more work.
2019-12-27 17:45:19 +01:00
bc2e6a7f9b
Ports "Fixes powernet avail checks"
2019-12-12 17:35:35 +01:00
a6fcac55d4
Makes it compile.
2019-06-07 04:05:27 +02:00
5a69499927
Hol up, unrelated PR time, atomization.
2019-06-07 01:32:15 +02:00
bc0d14c193
Continual updates until merged
2018-09-17 04:55:03 -05:00
1d0f775f56
Merge pull request #38360 from ShizCalev/key-cleanup
...
Cleans up some logging
2018-06-11 22:29:27 -05:00
4ae974644c
Standardizes and cleans up some admin messages & logging
2018-05-31 22:41:31 -05:00
6a07a66cb3
Merge branch 'master' into upstream-merge-37476
2018-05-06 07:07:02 +00:00
3369c804b2
Kills off /obj/item/device ( #6561 )
2018-04-30 00:06:58 -05:00
7d45e045a3
Uppercases slot defines.
2018-04-27 20:14:39 -05:00
5fa001c10f
things with stuff ( #6233 )
...
* buncha things from upstream
* datums globals, onclick
* datums
* game folder, holy shit mirror bot why
* modules
* icons
* dme
* compiles cleanly
* tools purge
* updates maps
* double check just because. and wew lad
* incidentally, this needs more work first
* some things
* weh
* sound cleanup and icons
* reeeee
* compile issues
* oh look, fresh code sync
* cleans up some unused icons
* dirty vars
* reeeeeeeeeeeeeeee
* wew lad. fuck off with this already
2018-04-07 23:07:09 -04:00
72ff7be9bd
code folder. 221 files changed wew
2018-02-12 21:03:40 -05:00
DeltaFire