Commit Graph

2463 Commits

Author SHA1 Message Date
LorenLuke
31e90bfeed Adds Collapsible AM rifle. Createes new uplink entry (#3644)
* Adds Collapsible AM rifle, and adds case with parts and 5 shots to Uplink. Separates it and intended merc version, both costing default telecrystal amount. Does NOT make them antagonist type specific.

* Addresses review.

* Makes rifle case traitor/merc specific. Enables ability to have specific uplink items be available only for specific antags.
2017-07-28 16:06:20 -05:00
Anewbe
31bc1f757f Merge pull request #3635 from LorenLuke/Bomb-Consistency
Tank/TTV Consistency improvement
2017-07-25 16:44:45 -05:00
LorenLuke
3a80ffa080 Fixes inconsistent behavior by TTVs and STBs. 2017-07-24 10:28:20 -07:00
Anewbe
a5114f99dd Embiggens the laundry baskets 2017-07-23 16:33:02 -05:00
Anewbe
196212faee Merge pull request #3614 from silveryferret/Polaris-R-UST-Port
R-UST Port, now in Polaris flavor.
2017-07-23 11:25:24 -05:00
Anewbe
91b06c20d1 Merge pull request #3622 from LorenLuke/tank-runtime-fix
Fixes a div/0.
2017-07-23 00:25:35 -05:00
LorenLuke
bc972c86e8 Fixes a div/0. 2017-07-22 22:05:45 -07:00
Spades
7e4417d31f It's CentCOM not CentCOMM
I swear to god I have fixed this like three times already and somehow it
keeps coming back.
2017-07-21 04:29:39 -04:00
silveryferret
7567726c07 Ports R-UST from Baystation12 + small admin debug verb 2017-07-19 20:33:16 -04:00
Anewbe
7669c83dfa Merge pull request #3607 from LorenLuke/one-tank-bomb
Changes Single-Tank-Bomb behavior.
2017-07-19 14:01:36 -05:00
Belsima
a291ae9889 Adds a load of zippos to the loadout. 2017-07-17 14:57:14 -04:00
LorenLuke
b7f5362276 See https://github.com/Baystation12/Baystation12/pull/14404.
(ignore point 13)
2017-07-16 16:03:31 -07:00
Anewbe
99320866b0 Merge pull request #3530 from VOREStation/qdel-hints-gen-4
Qdel Hints Round IV
2017-06-16 16:21:58 -05:00
Leshana
6a0cc39419 Fixes objects using walk_to() not being able to be garbage collected.
* Okay evidently walk_to(A, B) doesn't stop when A reaches B, but keeps running in the background forever until it is manually canceled!  Therefore in order to be garbage collected, we must cancel walking on any object that might have initiated it.
* Fixes this on chemsmoke and spiders.
* The same story applies to walk_towards; fixed for dust, meteors and immovablerod, and also to walk_away; fixed for flashbangs.
* Also fixed chemsmoke actually getting qdeled at the right time.
2017-06-16 13:40:15 -04:00
Leshana
c91dc333cd Some more types which need Destroy to return qdel hints! 2017-06-14 01:13:54 -04:00
Leshana
e48b548f2b More and more Destroy() cleanups all across the board - Return qdel hints. 2017-06-05 23:01:41 -04:00
PsiOmegaDelta
ebe5cc916d Port of @PsiOmegaDelta's Baystation12/Baystation12#16820
Ports tg's garbage collector subsystem and Destroy() returning qdel hints.
2017-06-05 22:10:06 -04:00
Anewbe
9d8f4cfa53 Fixes Death Alarms 2017-05-31 19:38:07 -05:00
Spades
3ff9d441f9 Finishes fixing ammo inconsistencies 2017-05-27 04:39:49 -04:00
Spades
8579adcc53 Naming convention of ammo is now consistent
s = Speedloaders. (Functionally the same as clips, but they're not
_really_ the same thing, just in case we change these later.)
c = Clips. (Can also be used to fill other magazines.)
m = Magazine. (Holds ammo rounds.)
a = Ammo. (Individual rounds of ammo.)
2017-05-26 19:32:23 -04:00
Anewbe
0bfc6de678 Trashbag can hold more 2017-05-13 10:20:45 -05:00
Anewbe
42fe5d9ed6 Merge pull request #3412 from VOREStation/pool-closed
Removes the datum pool, as it is not performant.
2017-05-08 17:21:24 -05:00
Leshana
44ff1a70c6 Removes the datum pool, as it is not performant.
* Creating new objects is cheap, in fact comparable to the cost of getting it out of the pool, so it doesn't help there.
* Placing items in the pool is far more expensive than letting them garbage collect due to the resetting of vars and such.
2017-05-04 01:58:33 -04:00
Neerti
fedef20a53 Merge pull request #3312 from Anewbe/dice_thing
Adds the Liar's Dice game
2017-05-03 16:02:18 -04:00
Anewbe
100ab0528f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into dice_thing 2017-05-02 11:13:53 -05:00
Yoshax
03ff489f7a Kinda reworks Hyposprays/Autoinjectors 2017-04-30 17:13:00 +01:00
LorenLuke
c0be57b200 Adds adjacency check. 2017-04-25 10:55:21 -07:00
LorenLuke
3c4ff5e0bb Can now apply handcuffs to oneself. 2017-04-24 15:43:07 -07:00
Anewbe
66f432925e Merge pull request #3337 from Yoshax/tapedatebatehate
Changes tape coloring + slight rework
2017-04-24 10:01:00 -05:00
Anewbe
08dedaaf98 Merge pull request #3353 from Neerti/4/21/2017_circuit_fixes
Circuit Bugfixes & QoL
2017-04-23 17:08:12 -05:00
Neerti
6dbff1ee83 Adds Drone Identification Cards
Drone FBPs now spawn with an EIO issued ID alongside their NT ID card.
Also makes the bartender's permit automatically name itself when created by the job_controller.
2017-04-23 16:30:32 -04:00
Neerti
2c25fcec02 Fixes Circuit Bugs & QoL chances 2017-04-23 09:51:53 -04:00
Mechoid
c64bfe5e66 Makes the Rapid Service Fabricator use an actual glass, not the parent. 2017-04-22 17:51:21 -07:00
Anewbe
7294e0c46b Merge pull request #3302 from Anewbe/pipe_sprite_issue
Pipe sprite issue
2017-04-20 11:45:16 -05:00
Anewbe
e2448a19dc Merge pull request #3315 from LorenLuke/Tape
Allows placing tape masks/restraints back on the roll.
2017-04-20 11:45:00 -05:00
LorenLuke
f85fe86fa7 Addresses @MagmaRam's concerns. 2017-04-19 18:37:21 -07:00
Yoshax
c9c046913f Changes tape coloring + slight rework 2017-04-19 19:37:56 +01:00
Neerti
e951ff344e Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 4/18/2017_modifier_system_and_lings 2017-04-19 13:47:57 -04:00
Anewbe
9d2df21777 Merge pull request #3328 from Neerti/3/14/2017_makeshift_armor
Adds Makeshift Armor
2017-04-19 10:13:20 -05:00
Neerti
ea6128f986 Adds Modifier System, Changes Some Ling Stuff
Adds a fairly simple system that allows adjusting various numbers like max health, incoming damage, outgoing melee damage, etc.  The nice part is that changing certain variables this way (like max health) is a lot safer than manually setting the max health var directly.
Changes a lot of short lines of code to point towards a variable's getter or setter helper instead of reading the var directly so the modifiers can work.
Endoarmor, delayed toxin sting, Enfeebling sting, and recursive adrenaline overdose now use the modifier system.
Enfeebling sting now only lasts two minutes, from five minutes, however it now also reduces the victim's melee damage by 25%/50%, and increases the damage they suffer by 10%/35%, for normal and recursive respectively.
Delayed Toxin Sting's effects are now felt all at once instead of over the course of a few minutes.
2017-04-18 21:23:59 -04:00
Neerti
6bd0f8742e Finished coding makeshift armor. 2017-04-18 03:16:10 -04:00
Anewbe
46d447e478 Merge pull request #3326 from Cerebulon/techoriginsfix
Fixes improperly formatted tech_origins
2017-04-17 20:57:28 -05:00
Cerebulon
843a59ca07 Fixes improperly formatted tech_origins for hatchet, scythe, reinforced glass, mechanical trap, kitchen utensils and kitchen knife. 2017-04-17 19:31:01 +01:00
Anewbe
b7751bab10 Changelog, adds the dicecup to the loadout 2017-04-17 12:44:34 -05:00
Anewbe
35d4f2455d Merge branch 'master' of https://github.com/PolarisSS13/Polaris into dice_thing 2017-04-17 12:27:36 -05:00
MagmaRam
cec43bf3d2 Updates in-game EVA manual 2017-04-17 11:19:39 -05:00
LorenLuke
6431ef58be Allows placing tape masks/restraints back on the roll. 2017-04-16 10:31:36 -07:00
Anewbe
fd070196dd Adds the Liar's Dice game 2017-04-15 23:28:15 -05:00
Anewbe
e455aba104 Merge pull request #3254 from Anewbe/wallets
Wallets can now hold permits.
2017-04-15 18:43:17 -05:00
Anewbe
0a1c6b7442 Fixes the smoking pipe sprites 2017-04-14 20:28:50 -05:00