Commit Graph

138 Commits

Author SHA1 Message Date
BlackMajor
2e03a529bf checking off the list 2019-12-29 22:11:10 +13:00
BlackMajor
c81d1fe7a3 Merge pull request #9867 from Ghommie/Ghommie-cit375
Ports "examine-code refactor"
2019-11-25 11:31:03 +13:00
Ghommie
dd101ef221 Part 2 2019-11-19 18:00:56 +01: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
kevinz000
48fb3a0f08 Merge pull request #9694 from kappa-sama/hosnowflake
Buffs security, nerfs antags
2019-11-10 11:40:41 -07:00
kappa-sama
3e95a66513 Update energy_gun.dm 2019-11-02 23:04:06 -04:00
Ghommie
b86c5059d5 [s] modkit uninstall() calling forceMove() calling loc.Exited() calling modkit.uninstall() calling f... 2019-10-30 13:17:12 +01:00
kevinz000
0064529362 Merge pull request #9610 from Ghommie/Ghommie-cit273
ports anti-magic component code updates (holymelon sold separately).
2019-10-29 21:26:03 -07:00
Ghommie
8c4e031a1b atom/movable's Destroy() calls MoveToNullSpace() which calls Exited(), thus handle_atom_del() is redunant. 2019-10-28 17:59:32 +01:00
Ghommie
68b1583a1a Fixing PKA mod double installation et similars. 2019-10-28 17:47:29 +01:00
Ghommie
ad7101d0aa ports anti-magic component code updates (holymelon not included). 2019-10-25 03:20:42 +02:00
BlackMajor
cebdc1414f Merge pull request #9540 from YakumoChen/laser-minigone
Reverts #9189 (Laser Minigun)
2019-10-22 13:36:45 +13:00
YakumoChen
6a5d1c20bd delete minigun 2019-10-20 03:08:20 +00:00
deathride58
50c27df28f Taser rework - Gives electrodes a debilitating status effect, makes disabler the default taser mode, and more 2019-10-15 03:48:44 -04:00
Ghommie
689136fe94 Nerfs cyborg disabler to hold 25 shots rather than 43, just like a normal disabler. 2019-10-09 23:07:39 +02:00
kevinz000
6e55fec7bd Merge pull request #9189 from Sishen1542/gatling
[READY] craftable laser minigun, because why not
2019-09-28 00:40:02 -07:00
YakumoChen
e297dbd0a3 Update energy_gun.dm 2019-09-21 02:39:47 +00:00
Sishen
a3967b6f77 aaaaaaaa 2019-09-03 02:29:08 -04:00
Sishen
b4f27b8841 allows renaming of non null rod holyweapons, fixes hypertool description 2019-08-31 18:05:09 -04:00
Sishen
d9fff579b1 damage and stamina balances 2019-08-31 17:39:51 -04:00
Sishen
ba5021af5b gives lasrifle the damage component, turns kevs divine lightblade into a hypereut to balance stats, adds hypertool 2019-08-31 02:55:29 -04:00
Sishen
b69c928419 FOR THE EMPEROR 2019-08-30 16:50:03 -04:00
Sishen
47ee3a8a6d fuck 2019-08-28 23:56:08 -04:00
Sishen
20f4e260e1 minigun ooga 2019-08-23 19:39:20 -04:00
Trilbyspaceclone
969b928642 Update special.dm 2019-07-29 07:53:41 -04:00
TrilbySpaceClone
13936e97de emiting happyness 2019-07-24 14:40:59 -04:00
Ghommie
f39a5d2f6a Ports in RPGs for nuke ops, failsafe uplinks and some carp plushie exploit fix. 2019-06-30 21:53:33 +02:00
Ghommie
85ab988842 0, null, and "", all fulfill the ! operator. 2019-05-30 20:09:19 +02:00
deathride58
f3116baa08 Merge pull request #8253 from Citadel-Station-13/kevinz000-patch-37
Removes firing pins from preprinted gravity guns
2019-05-21 08:04:26 -04:00
Trilbyspaceclone
150db880de Update laser.dm 2019-05-01 16:07:11 -04:00
Trilbyspaceclone
fd251d3dd2 Update laser.dm 2019-05-01 15:15:29 -04:00
Trilbyspaceclone
b4bdc9bc1d Update laser.dm 2019-04-26 00:47:21 -04:00
kevinz000
0e863d7daf Update special.dm 2019-04-16 22:42:36 -07:00
Ghommie
e9e9075800 unironically applying Kev's suggestion 2019-03-03 01:09:16 +01:00
Ghom
704d7403ac Tweaking some cyborg mounted energy guns. (#8037)
* You get yourself a bottle and say, "I don't love anything anymore."

* the sunset.

* I'm nuclear gun, I'm wild.
2019-02-27 16:02:33 -08:00
Ignari-Coldstorm
9c16527cd4 Mining Vendor and PPKA changes! (#7817)
* Mining Vendor and PPKA changes!

Adjusted the prices on a couple items as well as added in the pocket extinguisher to the vendor. Adjusted the Premium Proto-Kinetic Accelerator to have one less range.

* Update machine_vending.dm
2018-12-16 03:56:21 -08:00
deathride58
6c5694ce0c Merge pull request #7780 from Ignari-Coldstorm/Premium-KPA
Adds a new PKA to the mining Vendor
2018-12-03 11:20:37 -05:00
Ignari_Coldstorm
55517ae329 Adds a new PKA to the mining Vendor
Miners are always going and saying that they amass so many points while mining, yet nothing is worthwhile enough to buy with said points so they sit there wasted usually. This adds a new premium Kinetic Accelerator with stronger base stats, meanwhile it costs 8K mining points. Will later be adding premium edition of Kinetic crusher. Ideal goal is to encourage miners to mine enough ore for station to get this gear before they go out to hunt for real.
2018-11-30 20:18:49 -06:00
deathride58
dbd11b75d1 makes portal guns require firing pins (#7465) 2018-10-21 00:34:35 -07:00
Poojawa
720b25c6f5 floor fixes and gun memes 2018-09-22 03:50:37 -05:00
Poojawa
284e9d0325 module things, jfc 2018-09-11 07:51:01 -05:00
kevinz000
9325319da1 Update special.dm 2018-07-26 16:44:08 -07:00
deathride58
b1688405d9 and finally, the modules folder. Now I can publish and take a break 2018-07-02 01:19:37 -04:00
ShizCalev
4ae974644c Standardizes and cleans up some admin messages & logging 2018-05-31 22:41:31 -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
Dax Dupont
74932ddce0 Gun overlays 2: Electric boogaloo. (#38003)
* Reduces selfcharge gun processing/icon work

* More efficient gun overlays, adds old_ratio var

* oh my god it was calling the egun's update_icon?

* percent proc

* Attachment overlay overhaul

* Cut overlays in egun update

* ebow 1000% better overlay management

* Update gun.dm

* Pointless check

* Giving KA and children consistent icon behavior

* Update kinetic_accelerator.dm

* Fixed

* ..() readded

* ..() readded

* ..() readded

* Antur didnt catch this one heck

* Because confusing vars are apparently more maintainable

* Gun overlays 2: Electric boogaloo

* another one

* Chameleon guns are removed

* tentacles everywhere
2018-05-27 11:41:14 -05:00
deathride58
6a07a66cb3 Merge branch 'master' into upstream-merge-37476 2018-05-06 07:07:02 +00:00
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
oranges
7d45e045a3 Uppercases slot defines. 2018-04-27 20:14:39 -05:00
Poojawa
5518efebea everything but mob stuff 2018-04-23 01:06:17 -05:00