BlackMajor
08d042901c
thank you github
2020-01-02 22:16:47 +13:00
BlackMajor
aabb39a364
Revert "Merge branch 'master' into Yeehaw"
...
This reverts commit 30e3edaac162c8fce043
2020-01-02 22:06:31 +13:00
BlackMajor
30e3edaac1
Merge branch 'master' into Yeehaw
2020-01-02 22:03:58 +13:00
BlackMajor
3239acf74d
Sync
2020-01-02 22:02:55 +13:00
BlackMajor
8085022d97
Couple of changes. Starting on the point bank.
2019-12-31 23:28:30 +13:00
BlackMajor
8948e0491e
add mining card
2019-12-30 02:07:49 +13:00
BlackMajor
b811d3e57e
More work on it
2019-12-30 01:23:41 +13:00
BlackMajor
375e59a77d
Merge branch 'master' into Yeehaw
2019-12-29 22:12:40 +13:00
BlackMajor
2e03a529bf
checking off the list
2019-12-29 22:11:10 +13:00
BlackMajor
206a5e168a
More mining changes
2019-12-29 20:15:49 +13:00
BlackMajor
4e1a9b83cf
Pushing work for tonight.
2019-12-28 01:01:26 +13:00
Ghommie
93fbc17428
ports "Standardize obj/updateicon() and update_icons() to update_icon()"
2019-12-16 17:58:50 +01:00
kevinz000
659b78d8b8
Merge pull request #10162 from BlackMajor/Yeehaw
...
Removes medihounds (actually just makes them a medical aux sprite)
2019-12-13 16:52:22 -07:00
nik707
cdeb4733aa
Merge pull request #9863 from BlackMajor/Yote
...
No adrenals for borgs please
2019-12-12 23:50:34 -06:00
BlackMajor
83a707ee93
Removes medihounds, same treatment as janihounds
2019-12-13 13:48:22 +13:00
kevinz000
f883f55391
Merge pull request #9818 from GrayRachnid/portssaboteur
...
Ports the Saboteur borg for nukeops and new cyborg tools/weapon icons.
2019-11-19 21:28:25 -07:00
BlackMajor
1b1ed21f42
No adrenals for borgs please
2019-11-19 22:13:22 +13:00
GrayRachnid
3edaf75722
Ports the Saboteur borg for nukeops and ports new cyborg tool icons and cyborg taser/laser icons.
2019-11-15 16:58:45 -05:00
BlackMajor
ce94da9ed3
Merge branch 'master' into Yote
2019-11-14 17:37:57 +13:00
BlackMajor
4cd741310b
Borg changes and module compression
2019-11-11 16:35:20 +13:00
Ghommie
b653595702
Ports "Replaces the rpg loot datum with a component and makes some suffixes have real effects" & co
2019-10-31 22:40:11 +01:00
kevinz000
6dc6159f4a
Merge pull request #9578 from deathride58/mapsubsystemimprovements
...
Map config system improvements - Fixed and expanded map vote restrictions, map-specific announcer framework, and more
2019-10-29 21:42:32 -07:00
kevinz000
b172c5f691
Merge pull request #9501 from deathride58/stronksecborgs
...
Borg buffs - Allows jaws to incapacitate, gives secborg a taser, and more! (wall of text in desc)
2019-10-29 21:29:12 -07:00
BlackMajor
1b2d1c1423
Whoops again
2019-10-27 02:04:46 +13:00
BlackMajor
90d28b7202
whoops
2019-10-26 23:00:12 +13:00
BlackMajor
f3cbd43d8b
What if engiborgs could actually build machines
2019-10-26 22:58:28 +13:00
deathride58
68813b6846
Map config improvements - Adds more variables for the map voting system to take into account, allows far greater flexibility for mappers, adds a random chance for the medibot voice to be the station announcer
2019-10-22 19:14:12 -04:00
kevinz000
c0d4d32dee
Update robot_upgrades.dm
2019-10-21 14:36:21 -07:00
deathride58
b3a81dce01
Secborg buffs - Adds incapacitation functionality to k9 jaws, gives secborg a hybrid taser, tweaks pounces, adds config option to weaken secborgs
2019-10-14 18:18:32 -04:00
Fermi
89f3a01bc0
Merge branch 'master' into tg-Organ-port
2019-10-01 06:17:58 +01:00
Ghommie
0389293d4a
comma
2019-09-24 02:40:43 +02:00
Ghommie
ee8f1022cc
Fixes advanced med scanner upgrades, and other cyborg upgrades' incompatibility with dogborgs.
2019-09-24 02:02:24 +02:00
Fermi
c23d6f0113
I missed an earlier port.
2019-09-17 01:08:37 +01:00
Ghommie
0513f3464a
one
2019-06-05 19:20:25 +02:00
Trilbyspaceclone
823299acb9
Not as broken code as I thought
2019-03-25 17:05:36 -04:00
Trilbyspaceclone
da949a597f
Maybe!
2019-03-25 16:32:02 -04:00
MediHound
f8f482bc69
Changes to Borg upgrades and modules
...
Disabler Cooler now works for Security and K9, added Crew Pinpointer to Security and MediHound, added Crew Monitor to Medical.
2019-02-11 16:51:36 +01:00
deathride58
4c19f4a50a
you're too exhausted to be lifted up - makes it much harder to force someone to stand if they're in hard stamcrit ( #7683 )
2018-10-30 19:29:08 -07:00
Poojawa
d429eb67cd
remodularize vtec code
...
Works as expected now but, combat rework meme jog/spring override speeds
2018-10-20 07:19:19 -05:00
Poojawa
1d6355534c
Unmodularizes vtech controls
...
I swear most of this shit just doesn't work in modularization anymore.
2018-10-20 04:18:09 -05:00
Poojawa
dc9fd6db12
readds V-tech control, modularized properly
2018-09-17 22:35:43 -05:00
Poojawa
1a2460ed28
Continous update intergration until being merged
...
Also tgui fixes/updates
2018-09-15 00:37:29 -05:00
Poojawa
8b9ef1e400
Game folder
2018-09-11 04:06:45 -05:00
deathride58
6a5087877b
Merge pull request #7129 from PolymorphBlue/vTecControl
...
Modifies the vTec cyborg upgrade to be toggleable between off/half/full
2018-07-09 00:26:23 -04:00
deathride58
3e18d8208e
Updates to tgstation commit 78e471d
2018-07-05 01:22:27 -04:00
deathride58
91805b8789
and that just leaves the modules folder
2018-07-02 00:28:51 -04:00
Poly
7fd0e7ced6
Adds requested comment
2018-06-17 06:50:43 -07:00
Poly
212d971c03
Modifies the vTec cyborg upgrade to be toggleable between off/half-boost/full-boost
...
Adds a set of chevron icons to icons/mob/actions.dmi to show this - provided by Toriate
2018-06-16 11:40:46 -07:00
oranges
1d0f775f56
Merge pull request #38360 from ShizCalev/key-cleanup
...
Cleans up some logging
2018-06-11 22:29:27 -05:00
deathride58
2f9e3e403d
Hard upstream sync ( #6951 )
...
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync
* sync part 1 - underscore folders in code
* controllers folder
* datums folder
* game folder
* cmon, work
* modules - admin to awaymissions
* cargo to events
* fields to lighting
* mapping > ruins
* rest of the code folder
* rest of the folders in the root directory
* DME
* fixes compiling errors. it compiles so it works
* readds map changes
* fixes dogborg module select
* fixes typo in moduleselect_alternate_icon filepath
2018-05-31 16:03:18 -07:00
