shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
43,568 Commits 5 Branches 0 Tags
08f251a88c898ce3a635909512303170483694de
Commit Graph

57 Commits

Author SHA1 Message Date
keronshb
834ec62c0b Nightmare Jaunt Change 
Prevents Nightmares from being pulled OUT of jaunt from vendors and engraved messages.
 2021-05-03 00:05:39 -04:00
Letter N
7e427aa8e6 HOTFIX AEIOU 2021-03-04 16:20:44 +08:00
Letter N
6286d40082 code works 2021-02-12 17:26:08 +08:00
Letter N
834e4730b3 not existing 2021-02-09 15:44:49 +08:00
Letter N
f87aa0ac5b toast. And DiscoFox™️ 2021-02-08 18:46:05 +08:00
DeltaFire
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
DeltaFire
79af981467 fixes some fun limb code 2020-10-03 21:51:49 +02:00
Letter N
f1c4a7f6ac Merge remote-tracking branch 'origin/master' into TGUI-4 2020-08-09 14:54:16 +08:00
Letter N
9eb7aaa2d1 fixes pumps and reverts this small vending change 2020-08-07 16:12:44 +08:00
lolman360
ea97e98b5c Update _vending.dm (#13035) 2020-08-06 18:04:03 +02:00
Letter N
333ca2cc7b Merge remote-tracking branch 'origin/master' into TGUI-4 2020-08-06 18:26:04 +08:00
Letter N
a19e306137 less redtext - updates anomalies 2020-08-03 20:53:36 +08:00
Letter N
b376a6b6c4 Merge remote-tracking branch 'origin/master' into TGUI-4 2020-07-30 14:43:52 +08:00
Letter N
782e3c2ffb copypaste phase complete, major:vendies 2020-07-30 14:17:35 +08:00
timothyteakettle
8360bb1a7f section 2 2020-07-24 23:44:57 +01:00
Timothy Teakettle
7fb55a02a5 section one 2020-07-24 22:34:22 +01:00
Timothy Teakettle
974b80a2fd Merge branch 'master' into wound-port 2020-07-18 21:45:24 +01:00
timothyteakettle
e8fade4f7f changes 2020-07-18 02:29:12 +01:00
Timothy Teakettle
93b4570f8d more changes 2020-07-17 23:23:47 +01:00
Artur
6ee1eba56c Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-02 23:23:47 +03:00
Letter N
b35e3f2b93 fix: R&D Console, Vending, and chem master 2020-07-01 19:07:03 +08:00
Artur
20245f7319 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-06-30 02:30:29 +03:00
Ghommie
ae053a9a08 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit800 2020-06-23 03:12:49 +02:00
Artur
c41d2e78be Conflicts!!! 2020-06-22 17:39:24 +03:00
Ghommie
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
Ghommie
495ccc99c5 Porting some cargo/vending updates. 2020-06-08 06:12:51 +02:00
Artur
c73295279e Fixes asset cache client 2020-05-19 19:02:46 +03:00
Ghom
63fb4544b4 Another fix for contraband items costing like premium ones. (#12253) 2020-05-15 07:16:25 -07:00
Artur
dabdf16eac Coonflict fiiixeeess 2020-05-13 12:56:17 +03:00
Artur
5b7d9a9008 Merge conflict fix 2020-05-13 12:37:18 +03:00
Ghommie
88e499a39a Some quick economy fixes and improvements. 2020-05-13 03:31:16 +02:00
Ghommie
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
Lin
0acec2e56f vendors now accept dollar bills again (#12109) 
* make vendors accept bills

* build

* forgot that function

* this is better

* i thought i had a hook for this
 2020-05-05 05:38:19 +02:00
Ghommie
1cb83547fa whops! 2020-05-03 03:23:00 +02:00
Ghommie
53c0ea391e steam sales. 2020-05-03 02:54:13 +02:00
Ghommie
a194d7dafe merge conflict and job/dept discounts support. 2020-05-03 02:11:05 +02:00
Arturlang
53395171e1 Fixes vendors some (#12056) 2020-05-01 17:59:04 +02:00
Artur
80b47ec1c0 Ports https://github.com/tgstation/tgstation/pull/50497 2020-04-23 09:55:28 +03:00
Ghommie
4c6f1b622b Porting Goofconomy & co. 2020-04-17 07:48:11 +02:00
spookydonut
a6f6a27c87 Update code/modules/vending/_vending.dm 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-04-12 00:53:57 +08:00
spookydonut
230e5fca20 fix everything 2020-04-11 15:32:09 +08:00
Arturlang
f80900fd0b Fixes vendors not eating coins (#11795) 2020-04-09 19:07:11 +02:00
Artur
5fbe05f3c9 Cleaning up and finishing up 2020-04-08 18:16:10 +03:00
Artur
881f8765f4 Stufffs 2020-04-01 15:29:40 +03:00
Artur
4d53c3f6c0 updates vendors.. 2020-03-31 21:00:50 +03:00
Ghommie
95db5084ab Screw commit history. 2020-02-02 01:26:04 +01:00
Ghommie
9591bb5471 porting "global to static" 2019-11-09 22:53:56 +01:00
Ghommie
0513f3464a one 2019-06-05 19:20:25 +02:00
kevinz000
3abeb214fd Update _vending.dm 2018-08-20 14:57:31 -07:00
Unknown
761f2f931b tweaks 2018-08-09 10:16:15 +02:00