92b3c84a22
Make the code beautiful
...
Less lines, same code.
Trying to fix merge conflict.
Gah
2016-01-05 14:36:39 -02:00
0e23fdee89
M90gl dufflebag grammar fixed
...
Issue reported by LanCartwright.
2016-01-01 12:46:23 -06:00
b1d1f7753e
fixes santabag/suicide_act
...
fixes the path for santabag/suicide_act
2015-12-24 19:30:21 -08:00
c00e773b6d
Merge pull request #13818 from LanCartwright/nukeopsrenovation
...
NukeOps gun renovation with bundles
2015-12-20 21:59:17 -03:00
7d5f21259d
Changes c90gl to m90gl
2015-12-21 00:30:55 +00:00
b8bdc8fce3
merge error
2015-12-20 21:04:54 +00:00
986bfc8501
merge error
2015-12-20 21:04:09 +00:00
12206ae324
Merge branch 'nukeopsrenovation' of https://github.com/LanCartwright/-tg-station into nukeopsrenovation
...
# Conflicts:
# code/game/objects/items/weapons/storage/backpack.dm
2015-12-20 21:02:08 +00:00
060ed21b7c
adds so much more shit
2015-12-20 20:59:23 +00:00
d0c4089a33
whoops that was a mistake
2015-12-19 23:08:51 +00:00
bc450c1f76
Update backpack.dm
2015-12-19 22:56:02 +00:00
3818c227d2
For a 60 crew round, this theoretically allows all operatives to own a gun and some ammo, and still have some points left over for luxuries.
...
This mainly balances gun prices and adds new bundles
2015-12-19 22:44:49 +00:00
342ca5098c
adds christmas related suicide messages
2015-12-19 03:00:59 -05:00
d8a37204e7
Makes burn_state use defines
2015-12-13 05:36:55 -06:00
f697ae90f5
removes a bunch of .0
2015-09-10 20:57:30 +09:00
7453449531
Merge pull request #10975 from bustygoku/Backpacks-Slotstuff
...
Changes Backpack Slotcount to 21
2015-08-18 20:14:16 +01:00
c2e9592009
Added Changelog And Fixed Smuggler Satchel And Duffelbag
2015-08-05 13:10:57 -07:00
bd8d70ec26
New traitor item: storage implant
2015-08-04 18:28:38 +03:00
1d0b41b23a
Changes Backpack Slotcount
2015-08-01 11:29:59 -07:00
4688c2c969
Fixes proc arguments
2015-07-15 23:52:35 +02:00
3b4dbc4f27
Merge pull request #10216 from nukeop/syndiesurgerybag
...
Add Syndicate surgery bag to uplink
2015-06-29 15:52:55 -05:00
0316a836cb
add a Syndicate surgery dufflebag full of tools to the uplink
...
add a Syndicate MMI that lets traitors create subverted cyborgs (not
slaved and with emag laws) - this is included with the surgery bag
2015-06-28 02:54:49 +01:00
8c62ccfe2e
Moves clothes from out of equipment lockers and into wardrobe closets
...
- Wardrobe closets are not locked, so it should make it a bit easier to steal disguises
- Unclutters equipment lockers
- Heads still have their one lockers for convenience, but some of the clothes have been removed if they're already in a department's wardrobe
2015-06-27 17:22:02 -06:00
9591d2255d
Hoping this solves the merge conflict
2015-06-27 19:23:13 +02:00
8759f56f6f
Squashed Commits
2015-06-27 00:09:16 -06:00
ea9849a436
Reduce range of the BoH to 7.
2015-06-21 17:20:01 +02:00
b91e99507c
Base Changes for BlueSpace Content Transfer
2015-06-21 15:14:02 +02:00
2823a98244
Merge remote-tracking branch 'remotes/upstream/master' into thaw
2015-06-19 11:23:45 -04:00
50e49d1136
FEATURES SIX AND SEVEN: Suicide msg's and cloaks
2015-06-10 14:17:38 -04:00
fc88bce4b6
sets default shotgun ammo to slugs, makes syndicate ammo bag actually have ammo in it
2015-06-05 14:05:32 +01:00
b6191925bd
Fixes #9173
2015-04-26 17:59:05 -05:00
1fc89cb611
removes soh singulo interaction
2015-03-26 13:19:56 +11:00
a6a9aa8a89
adds some sanity checks
2015-03-25 18:03:48 +11:00
a5396f320a
confirmation check for boh bombing + soh also makes singulo
2015-03-25 17:29:43 +11:00
b794cf5211
New Botany backpack and satchel. Also fixes satchel spawning without iconstate.
2015-02-27 20:02:24 -06:00
abee661784
Adds in Nienhaus' departmental backpacks and fixes itemstate for a few satchels.
2015-02-26 23:39:27 -06:00
5fc7af7fbf
attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.
...
Items reset their pixel_x and pixel_y values on pickup.
2015-02-19 13:02:43 +00:00
d47f6334c3
fixes dufflebag max weight class
2015-01-29 16:05:33 -05:00
28bff00e6a
removes 2 syndie bags, removes slowdown from syndie bags
2015-01-22 23:49:14 -05:00
a811bba285
adds fanny packs and dufflebags to various lockers
2015-01-21 02:17:22 -05:00
93166940f7
fixes singulo bombing
2014-12-17 02:25:33 -08:00
79e8ad4142
The singularity/narsie are no longer machines
2014-12-12 19:42:37 -03:00
876a5b1bfb
Fix for storages and equip
...
Yeah
2014-11-27 19:28:03 +03:00
e5e6ded884
singularity is now OOP
2014-10-20 16:36:00 -07:00
eae5d0b7af
Smuggler pack can now fit in backpacks itself
...
Fixes some sprite issues
2014-10-01 17:33:08 -05:00
d98cf02a3f
Adds smugger packs to mining room, replaces booby-prize beer keg.
...
Adds to uplink_item.dm
Updated code, latest sprites.
2014-09-27 19:59:25 -05:00
ce3dca998b
Adds hidable backpack
2014-09-27 19:26:44 -05:00
6c7af5eb32
SPANCLASSES!!!!!
2014-08-26 09:52:13 +02:00
24b18fad93
Absolute paths for item files.
2014-08-07 23:02:43 +02:00
af00fd14bf
Mimepack
...
This is a simple backpack for the mime.
2014-03-31 17:49:40 +02:00
SouDescolado
arty23
PKPenguin321
tkdrg
Akke
bgobandit
KorPhaeron
bear1ake
Remie Richards
bustygoku
c0
Firecage
Cheridan
barackobama
Ikarrus
LaharlMontogmmery
Xhuis
Dorsisdwarf
TheVekter
Jordie0608
dannno
paprka
Razharas
Hornygranny
Cheridan