Commit Graph

6358 Commits

Author SHA1 Message Date
Lularian
8d12c27499 belts 2017-06-19 15:46:47 -05:00
Joan Lung
38ec5563dc Fixes slips 2017-06-19 14:57:25 -04:00
pigeons
bdc4c9412e Refactors PDA cartridge permissions (#28567)
* Refactors cartridge access into bitflags

* Adds BitCount helper

* refactors cartridge access in virus cartridge

* Adds comments to BitCount

* detonate -> detonatable for readability, undetonatable PDAs will no longer show they've successfully detonated after sending virus

* dumb

* edits

* .

* space
2017-06-19 14:56:41 -04:00
Ergovisavi
9f30277c2d Take two at making ATMOS actually capable of fixing ATMOS in a timely manner 2017-06-19 00:24:01 -07:00
Joan Lung
2672d88800 Renames stun effects and changes stun input values as preliminary work for changing stuns to status effects (#28524) 2017-06-18 23:03:51 -03:00
Ashe Higgs
a405334588 Construction alien closets now consumes two alloy (#28573) 2017-06-18 21:20:06 -04:00
Expletive
1860e1a2ea Paper frames, but with new sprites. (#28452)
* Paper frames, take two

* With entirely new sprites

* and basemap

* no directional doors also smoothing

* changes requested

* woops

* deconstruct -> Destroy
2017-06-18 10:45:35 -04:00
Jordan Brown
91d59af7c4 Merge pull request #28531 from Expletive/crayonpdas
Move the clown and mime's unique crayons to their PDAs.
2017-06-18 10:10:05 -04:00
bgobandit
5bc348c366 Adds traitor steal objective: the Supermatter Sliver. (Fixed) (#27913)
* Adds a new steal objective, the Supermatter Sliver.

* actually commits theft_tools honke

* i actually dk what this is

* fixes v1

* Supersmatter sliver requested changes

* you know what I fucking hate is unchecking shit

* please does this fix it fucking dme clown shit

* placates the cyberboss and the lziard

* fucking clownery

* I forgot to fucking check it

* Hope this fixes it

* will my children inherit this PR

* reeeeeeeeeeeeeeee

* Let's put this horse to rest now....
2017-06-17 22:32:38 -04:00
Expletive
9f1c198b13 Space cash descriptions are more descriptive (#28508) 2017-06-17 22:55:09 -03:00
Expletive
5eef7d52bc Merge branch 'master' into crayonpdas 2017-06-17 18:39:18 -07:00
Jordan Brown
187ae0bd0e Merge pull request #28419 from Expletive/pocketprotectors
Gives Pocket protectors to various nerdy jobs on the station.
2017-06-17 16:13:09 -04:00
Joan Lung
8fd4098d2e Merge pull request #28506 from RandomMarine/RCDvals
Makes RCD ammo use consistent + small speed tweaks
2017-06-17 15:55:54 -04:00
Joan Lung
f07435337c Merge pull request #28435 from lzimann/typecaches
Changes a lot of is_type_in_list to use a typecache
2017-06-17 12:33:03 -04:00
Lzimann
42aa0dd3aa Changes all the typecaches to the obj definition 2017-06-17 13:24:40 -03:00
Expletive
e5c22d527e Move unique crayons 2017-06-16 21:27:39 -07:00
Expletive
fe73e0e920 Gives the captain a somewhat robust golden fountain pen, and some others an average fountain pen. (#28382) 2017-06-16 22:12:10 -03:00
Ashe Higgs
88d3ef2fe8 Hand drill, jaws of life, and emitter grammar tweaks (#28493) 2017-06-16 17:18:56 -03:00
Leo
a95aa5443f Merge pull request #28395 from Thunder12345/genuinecatproducts
Adds genuine cat fur products
2017-06-16 14:51:03 -03:00
RandomMarine
815233a2ea RCD ammo use consistency 2017-06-15 22:57:17 -07:00
Robustin
ad25367887 inducer fix (#28464) 2017-06-15 19:03:44 -05:00
kevinz000
b6a4a32633 Adds a check_tick to pneumatic cannon examine (#28345) 2017-06-14 09:59:40 -03:00
Joan Lung
56e391561b Merge pull request #28413 from optimumtact/cellulardestruction
Fix runtime in inducer emp act
2017-06-13 22:22:30 -04:00
Joan Lung
0e29560b9e Merge pull request #28404 from Expletive/fancymedalbox
Medal lockboxes are now fancy, and will accurately represent their contents.
2017-06-13 20:40:51 -04:00
Joan Lung
91f26d2766 Merge pull request #28399 from Tacolizard/fireaf
Minor flamethrower fix
2017-06-13 18:12:38 -04:00
Lzimann
3b7fc1afc2 Changes a lot of is_type_in_list to use a typecache 2017-06-13 15:56:09 -03:00
Expletive
7d4b3c38f7 Mutable Appearances 2017-06-13 10:32:35 -07:00
Joan Lung
fc7654aca1 Merge pull request #28393 from Cyberboss/patch-131
[s] Fixes charter exploit
2017-06-13 13:12:15 -04:00
kevinz000
968a384605 Fixes dead PKborgs having active dampener fields (#28214)
* Create robot_items.dm

* on mob death
2017-06-13 09:23:18 +02:00
Expletive
a032a81989 Merge branch 'master' into pocketprotectors 2017-06-12 22:25:54 -07:00
Expletive
f24a84d5a4 Adds pocket protectors and gives them to a bunch of nerds. 2017-06-12 21:39:50 -07:00
oranges
14969aa8a9 Fix runtime in inducer emp act
Was not passing the severity into the cell's emp act
2017-06-13 02:43:52 +00:00
Expletive
4aedb9c327 changesrequested 2017-06-12 14:48:37 -07:00
Expletive
5396d60f44 Flashdarks can't be used for examining eyes/mouth. (#28352) 2017-06-12 18:36:57 -03:00
Expletive
1609a4aeb1 Makes medal boxes fancy. 2017-06-12 13:53:50 -07:00
Tacolizard
49b6c29641 maintainers force me 2017-06-12 13:14:40 -07:00
Tacolizard
2cf63eaf20 this shits fire 2017-06-12 12:15:52 -07:00
Thunder12345
93a6dcb02e cats 2017-06-12 17:49:28 +01:00
Jordan Brown
275e9abfad Fixes charter exploit 2017-06-12 12:37:40 -04:00
Jordan Brown
d73810f9f1 IED code cleanup (#28318) 2017-06-11 22:47:30 -03:00
Leo
93f1e1b605 Merge pull request #28331 from QualityVan/lighters
Lighters need to be on
2017-06-11 22:44:08 -03:00
Ashe Higgs
33329e50b5 Fixes IED sprites inheriting their can's offsets (#28317) 2017-06-11 18:28:22 -04:00
Lzimann
3e34eb9e3f Changes all sounds to be lower case, plus standardizes their references 2017-06-11 00:38:45 -03:00
QualityVan
c18f68df6d Lighters need to be on 2017-06-10 22:06:35 -04:00
ShizCalev
eb9f0baeec Makes RADIMMUNE species incompatible with radiation based DNA injectors (#28246)
* dna injector

* why the fuck is my git client doing this
2017-06-10 19:19:12 +02:00
Mike Long
8e07021c0d Adds F.R.A.M.E. cartridge (#28113)
* Refactors old PDA virus cart code

* Adds F.R.A.M.E. cartridge

* Adds FRAME to uplink

* FRAME can now be used to push telecrystals to the target.

* Makes cartridges more extensible.

* Fixes compilation

* Fixes exploit involving removing target's TC if used multiple times.

* Removes redundant var, in accordance with convention.

* Things actually work now.  Whoops.
2017-06-10 19:17:33 +02:00
TrustyGun
1db56a3d58 Clown Toy Box + Wooden Crates (#28227) 2017-06-09 13:01:51 -03:00
Joan Lung
7ec67bc960 Merge pull request #28202 from Tacolizard/medalmemesv2ultra
Gives the RD and HoS medal lockboxes
2017-06-08 21:36:06 -04:00
ShizCalev
f2d829261a [Typo] Duffel Bag (#28200) 2017-06-08 19:16:20 -03:00
Tacolizard
5ea7095875 remake 2017-06-08 12:35:32 -07:00