Commit Graph

988 Commits

Author SHA1 Message Date
Cheridan
856583d6c5 Merge pull request #24989 from jughu/honeybum<3
Lets you carry honey in plant bags
2017-03-13 14:33:29 -05:00
jughu
03886f7d43 Update bags.dm 2017-03-11 18:00:04 +01:00
Lexorion
e5e4101f45 gives the bag of holding unique inhands (#24985)
* gives the bag of holding unique inhands

* improves south sprite
2017-03-11 11:17:57 -05:00
Cheridan
4418958f94 Merge pull request #24911 from Supermichael777/Box-meme
Removes the singularity beacon kit from the traitor bundle list.
2017-03-11 02:51:12 -06:00
Lzimann
5a618297ce Replaces the default output with the to_chat wrapper. 2017-03-10 01:32:05 -03:00
Supermichael777
c8c6985398 okay 2017-03-09 19:58:35 -05:00
Supermichael777
ff8d971348 Removes the lord singulo box from the memeboxes list 2017-03-09 18:53:33 -05:00
coiax
f88184937a Glowsticks (#24761)
* Ports glowsticks from Bay

* Adds glowstick sprites

* Glowsticks in party crates, maint and emergency toolboxes
2017-03-08 02:38:15 -06:00
Joan Lung
774f7e3100 Fixes things having latches that shouldn't (#24715) 2017-03-07 12:19:57 +01:00
Supermichael777
f7a38c2113 Adds a Chameleon belt (#24569)
* adds a mildly evil belt

* adds the belt to a kit that sorely needed it
2017-03-07 09:10:36 +01:00
Xhuis
86488d18d3 Fixes some issues and closes others; nerfs abductor emergency teleporter (#24690)
* Fixes Wish Granter resurrection spam

* Fixes box icons

* Emergency teleporter nerf
2017-03-06 12:20:55 +01:00
jughu
7e2fc83e1f Detective's revolver and ammo now starts in his holster (#24622)
* Update belt.dm

* Update security.dm

* Update belt.dm
2017-03-04 01:05:38 -06:00
Joan Lung
3706105960 Fixes brass box hinges (#24533)
* I regret making these a toolbox subtype

* consistency!
2017-03-02 19:31:11 +13:00
militaires
00ce587fb8 boxes 2017-02-27 23:58:59 +03:00
WJohn
299c7d4d52 Merge pull request #24450 from TrustyGun/box_autism
Improves box sprites
2017-02-26 19:45:37 -05:00
TrustyGun
e6cdb313a5 fixes syndie_box 2017-02-25 20:03:25 -05:00
Kyle Spier-Swenson
5ddeb50c29 Fixes progress bars when transferring between storages (#24413) 2017-02-25 17:51:30 -06:00
coiax
f7e6327d0a The theme of a chef box is also in the name (#24426)
Previously it was only in the description. Makes it slightly more
obvious.
2017-02-25 17:48:48 -06:00
militaires
ce34afa14c fixes kommisar konflikts and the final hopefully commit to the purge of non-3/4 boxes 2017-02-24 12:03:06 +03:00
militaires
ac701e9299 Merge branch 'master' of https://github.com/tgstation/-tg-station into more_3/4
# Conflicts:
#	code/game/machinery/cloning.dm
2017-02-24 11:54:55 +03:00
militaires
288e99a194 try again 2017-02-24 11:52:00 +03:00
Kyle Spier-Swenson
bf39570688 Lagchecks removing from storage, reverts bluespace ore satchel limit (#24310) 2017-02-24 16:22:57 +13:00
Cyberboss
56a6eaa8e6 Overlay queuing (#23922)
* Overlay queuing

* Fix SS flags

* Don't copy on assignment

* Flags processing

* Fix icon_smoothing

* MSO's helper proc

* Legacy detection

* Make it work

* Fixes shitcode

* Fix the flag

* |= -> +=

* OK, how did I fuck that up?

* shitcode

* Conditional assoc queue while initializing

* Cleanup everything

* Orange meme

* This isn't perfect, but its the best byond will give us.

* forgot about dir

* oh ya

* This was litterally the last thing i did last night before heading to bed

You can tell can't you?

* Fixes various shit

* Let's not ever pause

* Fix the flag

* Cleaned up some missing shit. Added image dummys

* Remove the one usage of FPRINT

* Jesus get rid of this
2017-02-22 21:44:55 +13:00
danno "big fucking moron" brando
93a49d03e6 danil mubme (#24339) 2017-02-21 15:45:19 -06:00
militaires
a9c0e59aba pls 2017-02-20 23:06:05 +03:00
oranges
6c6cda8af6 Merge pull request #24282 from MrStonedOne/patch-314
bumps bluespace ore thingy up to 500 ores
2017-02-20 17:04:21 +13:00
Militaires
d0b2fa15ec rare double latched toolboxes and very rare triple latched toolboxes (#24148)
* legendary

* the legendary

* wj_you_dont_understand

* my cycles of guilt are inescapable help me

* atomized pr for joan

* dosh fixees conflict

* aaaaaa

* the mad citrus

* reeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee fix conflict

* switch 0 1 true false

* moves add overlay cut overlay to update icons

* new to initialize
2017-02-19 20:48:25 +01:00
Kyle Spier-Swenson
daf8c0e47c bumps bluespace ore thingy up to 500 ores
\>going from infinite to 2x

\>not 10x

like come on. a 50dev bomb on produces 10 to 20k ore items and the server handles **throwing** them just fine, I think it can handle dumping more than 100 ores.
2017-02-19 00:50:40 -08:00
Militaires
74d4a82db8 HIS GRACE ASCENSION (#24065)
* legendary

* the legendary

* wj_you_dont_understand

* my cycles of guilt are inescapable help me

* fixed conflickits

* okay pls do

* So tumblers two sealed deep inside
One lock made of Golem's hide
By Courga's grace and Fourga's pride
I bid you, portals, open wide.

* fixes his grace ascension further

* for joan

* more fixes

* gramer

* fix another fuckup with hisgrace

* final commit i pormis for his grace ASCENSION

* switches 0 1 true false
2017-02-18 22:11:53 +01:00
oranges
740d184049 Places a cap on the bluespace mining bag (#24226)
This causes a server crash if you collect a huge number of ores and then
move them around

This is currently capped at about 2x the normal bag, which should still
be an upgrade on the current ore bag.
2017-02-18 05:59:09 -06:00
TrustyGun
38419057b7 Advanced Mimery Kit (#23978)
d

🆑
add: Traitor mimes can now learn two new spells for 15 tc.
add: The first, Invisible Blockade, creates a 3x1 invisible wall.
add: The second, Finger Guns, allows them to shoot bullets out of their fingers.
/🆑

Traitor mimes can buy the Guide to Advanced Mimery for 15 tc. Invisible Blockade creates a 3x3 invisible wall around the mime, and Finger Guns allows Mimes to shoot bullets out of their fingers.

Invisible Blockade is 3x1 now to avoid this problem and still make Mimes be blocked by their own walls.
2017-02-19 00:49:40 +13:00
Joan Lung
db94a3d83b His Grace is a better item and less globally-announced (#23951)
* His Grace is a better item and less globally-announced

* grace

* graceful

* tiny eyes!

* tiny eeeeyes

* less lethal

* You must have His Grace.

* You just need to compile His Grace.

* highly lethal grace

* ding ding ding you're super fucked

* rrr

* His Grace
2017-02-16 15:18:45 +01:00
Cyberboss
d27899ce64 Unequip refactor fix pack (#24040)
* Fixes drag drop deletion

* Fix it for clothing as well

* Do it properly

* Various other incap checks I noticed from the unequip refactor

* Time to generalize this shitty shit

* PADDLING!!!

* A whole bunch of ree
2017-02-14 08:52:56 +01:00
RandomMarine
6cfa865b4c splits apart charcoal pills 2017-02-12 08:40:22 -08:00
Cheridan
74588b703b Merge pull request #23946 from coiax/hug-box-2
Clown internals box is now a box of hugs
2017-02-12 02:43:56 -06:00
Dannno
597242748a whhops 2017-02-11 14:34:14 -05:00
Dannno
bb5107f4b8 lmao i threw up on your ugly toolboxes you fat fags 2017-02-11 12:32:59 -05:00
Jack Edge
63dc0d9366 Clown internals box is now a box of hugs
🆑 coiax
add: The clown's survival/internals box is now a box of hugs. Dawww.
/🆑

Was suggested. Means the clown revolver (coming in a box of hugs) isn't
as meta'able.
2017-02-10 20:24:03 +00:00
Cheridan
530d4aa887 Merge pull request #23883 from coiax/hug-box
Reverse revolver now comes in a box of hugs
2017-02-10 02:14:45 -06:00
oranges
8621296168 Merge pull request #23828 from Cyberboss/dropexactfix
Fixes the ex_act -> drop -> ex_act runtimes
2017-02-09 20:32:03 +13:00
Jack Edge
622eafe8ef Reverse revolver now comes in a box of hugs
🆑 coiax
add: A reverse revolver now comes in a box of hugs.
/🆑

- You can now tell if the revolver you got in your surplus crate is a
REAL revolver, or a reverse one. Also, free hugbox.

Closes #23872.
2017-02-09 04:04:29 +00:00
Xhuis
21996756be Adds the artistic toolbox and His Grace (#23699)
* Adds His Grace

* Resets victims and warnings on sleep

* Now with compiling!

* Adds the artistic toolbox and maintenance loot
2017-02-08 18:22:00 +13:00
Cyberboss
67214110e4 Fixes the ex_act -> drop -> ex_act runtimes 2017-02-07 14:24:11 -05:00
Joan Lung
d1c035aa19 Merge pull request #23701 from Xhuis/ez_clean
Adds EZ-clean grenades to the uplink
2017-02-05 20:33:11 -05:00
jughu
4ae2eec15f Fixes #23647 (#23653)
* Ha ha HAHAHA

* Update book.dm
2017-02-05 12:27:30 +13:00
Xhuis
0d68a8f770 Adds EZ-clean grenades to the uplink 2017-02-04 15:59:36 -05:00
Cyberboss
6ec1fe2242 [s]Fixes nuke disks not relocating sometimes (#23597)
* Fixes remove from storage not forceMoving

* Fixes disks not relocating in some cases
2017-02-03 00:29:35 +13:00
oranges
65704446cc Merge pull request #23508 from jughu/BOOKBAG
NERFS BOOKS YES YOUR BOOKS LIBRARIAN NERF HIGH PRIORITY SPEEDMERGE
2017-02-03 00:23:57 +13:00
Cyberboss
3f7f5d4000 Removes/Refactors /mob/unEquip (#22918)
* Part1

* IT COMPILES!!!!

* Fuck wait this was missing from that last

* Update handlabeler.dm

* Update handlabeler.dm

* Fixes n shit

* Fix this

* Fixes #23310

* Fucking @RemieRichards was right

* Fixes devil unEquip

* WTF ARE BITFLAGS?

* THERES THE FUCKING PROBLEM

* Fixes
2017-01-31 09:28:31 +13:00
oranges
3f7b94e923 Merge pull request #23275 from coiax/empty-uplink-implant
Uplink implants are now empty by default
2017-01-31 09:23:35 +13:00