bawhoppen
460fea66c8
Moves all stack object sprites from items_and_weapons.dmi to their own file
2017-10-04 11:59:53 -05:00
LetterJay
47a65d829d
Merge branch 'master' into upstream-merge-29741
2017-09-30 13:35:47 -04:00
AutomaticFrenzy
91c1a78af9
Fixed duplicate definition ( #31048 )
2017-09-28 10:43:24 -05:00
Ashe Higgs
e575bd6685
(Ready) Clockwork Cult Rework: Proof-of-concept
2017-09-26 15:22:09 -05:00
Militaires
3aec72d4f4
Adds Gondoland and the rare Gondolas ( #30530 )
...
A strange race of bear-like beings consisting of a head placed DIRECTLY on a pair of legs, their fur sells for extremely high prices.
The gondoland asteroid is the last natural habitat for these rare creatures.
2017-09-10 17:10:45 -05:00
Poojawa
3ba2f650dd
Adds Paradise Sofas ( #2623 )
...
* Adds Paradise Sofas
* Actually enable them to be constructed
* Coding standards, sheesh
* am path guder
2017-09-06 07:54:23 -05:00
kevinz000
3254fcf535
goddamnit_again ( #2511 )
2017-08-26 18:43:57 -07:00
LetterJay
188193eb61
here we go again ( #2456 )
2017-08-24 19:24:25 -07:00
kevinz000
35b7b93b24
ok this is going to be a pain in the ass ain't it ( #2458 )
...
lets hope nothing blows up this time (Flags PR but it works!)
2017-08-22 05:01:38 -07:00
kevinz000
6a309b5996
Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" ( #2457 )
...
ok you know what yeah i think i'll properly mirror https://github.com/Citadel-Station-13/Citadel-Station-13/pull/2411
2017-08-22 04:04:21 -07:00
LetterJay
a0cf777040
Merge branch 'master' into upstream-merge-29940
2017-08-21 23:29:24 -05:00
CitadelStationBot
87b3df3069
Replace all secondary flags with bitflags stored in the flags_2 var
2017-08-17 09:19:14 -05:00
CitadelStationBot
72cf7083f6
Fixes leathercrafting recipies trying to build on the floor.
2017-08-17 09:19:09 -05:00
CitadelStationBot
dd22c79678
Completes major inhand split project ( #2178 )
2017-08-02 06:30:33 -05:00
LetterJay
35fba1933e
Merge pull request #2063 from Citadel-Station-13/upstream-merge-29304
...
[MIRROR] Made some object lists less terrible to read
2017-07-31 03:43:03 -05:00
CitadelStationBot
9d7820a81c
Fixes two consistency/grammar issues ( #2161 )
2017-07-28 23:51:36 -07:00
CitadelStationBot
a72962c300
Made some object lists less terrible to read
2017-07-18 09:44:43 -05:00
CitadelStationBot
90c2a4f867
Removes now-unnecessary obj_integrity definitions
2017-07-09 19:44:48 -05:00
CitadelStationBot
2d84e09851
Fixes plasma glass merging with normal glass
2017-07-08 09:45:46 -05:00
Poojawa
b1b4826c0c
July 5th TG sync ( #1883 )
...
July 5th TG sync
2017-07-05 22:14:19 -05:00
CitadelStationBot
73557a5e5f
Fixes cardboard tube duping ( #1854 )
2017-07-01 21:20:39 -07:00
CitadelStationBot
c80d8af7aa
[MIRROR] Makes dressers buildable ( #1718 )
...
* Makes dressers buildable
* Delete sheet_types.dm.rej
2017-06-30 21:26:11 -07:00
LetterJay
d3c2f5aee6
Merge pull request #1778 from Citadel-Station-13/upstream-merge-28766
...
[MIRROR] Robotic legs are not weak to glass shards
2017-06-26 06:26:46 -05:00
LetterJay
faa0849b4b
Merge pull request #1663 from Citadel-Station-13/upstream-merge-28573
...
[MIRROR] Alien closets now correctly cost two alloy to make (Fixes #28561 )
2017-06-26 06:13:59 -05:00
LetterJay
ed6c0b042e
Merge pull request #1508 from Citadel-Station-13/upstream-merge-28227
...
[MIRROR] Clown Toy Box + Wooden Crates
2017-06-26 04:29:08 -05:00
CitadelStationBot
1982321419
Robotic legs are not weak to glass shards
2017-06-25 23:47:38 -05:00
LetterJay
a4c9dc43dd
Dufflebag => Dufflebag
2017-06-19 16:42:05 -05:00
CitadelStationBot
ba0e9e8e93
Alien closets now correctly cost two alloy to make ( Fixes #28561 )
2017-06-18 20:20:49 -05:00
CitadelStationBot
f26cf4e9ef
Clown Toy Box + Wooden Crates
2017-06-09 11:02:37 -05:00
CitadelStationBot
b5d2cf3c99
[READY] Stacks will change item_states and w_class based on how full they are. ( #1370 )
2017-06-04 09:08:33 -07:00
CitadelStationBot
c5b0f01dcd
Splits up mine_items.dm
2017-05-26 13:19:42 -05:00
CitadelStationBot
3a97af10cf
Water wets hide, you can microwave wet leather
2017-05-24 00:18:51 -05:00
CitadelStationBot
acbaa45aee
Adds a few new recipes created with plastic sheets ( #979 )
2017-05-18 11:53:17 -05:00
CitadelStationBot
a681b306a6
[MIRROR] Buffs plasma and nerfs snow ( #924 )
...
* Buffs plasma and nerfs snow
* Update mineral.dm
* Delete mineral.dm.rej
2017-05-18 11:13:28 -05:00
CitadelStationBot
6617f68604
[MIRROR] Harvesters are more fun to play ( #894 )
...
* Harvesters are more fun to play
* resolve .rej
2017-05-18 07:12:29 -05:00
CitadelStationBot
ff9928fdd7
[MIRROR] Makes it clear whether (in)complete golem shells are free or servant ( #857 )
...
* Makes it clear whether (in)complete golem shells are free or servant
* resolves rej file
2017-05-18 04:40:12 -05:00
CitadelStationBot
4f971be3a9
[MIRROR] Golems do not have underclothing ( #784 )
...
* Golems do not have underclothing
* Resolves .rej
* Update golems.dm
* Update golems.dm
2017-05-18 03:53:14 -05:00
CitadelStationBot
d2be6cfeb5
Refactors leather & Crafting with Bigenerator ( #849 )
2017-05-18 01:11:58 -05:00
CitadelStationBot
f52625b18c
Refactors supply talismans to be less shitcode
2017-05-15 17:54:16 -05:00
LetterJay
52fa1f314f
Merge branch 'master' into upstream-merge-26760
2017-05-14 01:02:26 -04:00
CitadelStationBot
faf8829d30
[MIRROR] Adamantine golem leadership ( #785 )
...
* Adamantine golem leadership
* Update stylesheet.dm
* Delete golems.dm.rej
* Delete stylesheet.dm.rej
* Update golems.dm
* fuck line endings
2017-05-08 22:16:09 -07:00
kevinz000
13b0ae2b45
Merge pull request #676 from Citadel-Station-13/upstream-merge-26725
...
[MIRROR] Proselytizers can now charge from Sigils of Transmission, and Sigils of Transmission can be charged with brass
2017-05-07 19:37:35 -07:00
CitadelStationBot
da781e0d76
Adds aesthetic basalt floor tiles
2017-05-04 06:12:26 -05:00
CitadelStationBot
036109de58
Changes a bunch of hrefs to the proper defines
2017-05-02 02:20:07 -05:00
CitadelStationBot
fad23e97c3
Proselytizers can now charge from Sigils of Transmission, and Sigils of Transmission can be charged with brass
2017-05-01 07:24:29 -05:00
LetterJay
a06c6a2994
Merge pull request #508 from Citadel-Station-13/upstream-merge-26337
...
[MIRROR] Refactors picture frames to use wall frames system
2017-04-25 01:10:40 -05:00
CitadelStationBot
4baa357739
Fixes easter eggs spawning during non-easter; SSevent now inits before SSticker
2017-04-24 18:07:12 -05:00
CitadelStationBot
05d8550771
Refactors picture frames to use wall frames system
2017-04-21 17:54:34 -05:00
Poojawa
7e9b96a00f
April sync ( #360 )
...
* Maps and things no code/icons
* helpers defines globalvars
* Onclick world.dm orphaned_procs
* subsystems
Round vote and shuttle autocall done here too
* datums
* Game folder
* Admin - chatter modules
* clothing - mining
* modular computers - zambies
* client
* mob level 1
* mob stage 2 + simple_animal
* silicons n brains
* mob stage 3 + Alien/Monkey
* human mobs
* icons updated
* some sounds
* emitter y u no commit
* update tgstation.dme
* compile fixes
* travis fixes
Also removes Fast digest mode, because reasons.
* tweaks for travis Mentors are broke again
Also fixes Sizeray guns
* oxygen loss fix for vore code.
* removes unused code
* some code updates
* bulk fixes
* further fixes
* outside things
* whoops.
* Maint bar ported
* GLOBs.
2017-04-13 23:37:00 -05:00
TalkingCactus
c997ebcabd
Removes Lag (tm) ( #313 )
...
* sensible fixes
* this too
* some more
* fixes chair icons
reverted to state before tg pull
* fixes telecomms icons
revert to state before tg pull
* fixes research icons
reverted to before tg pull
* de-whitewashed the stools
* fixed missing broadcaster sprites
* always load from the savefile
helps custom servers who don't want to fuck with the config, this will
never not be wanted with the system we have
* stop it, ghosts
* fixes limb augmentation
https://github.com/tgstation/tgstation/pull/25446
* removes lag
* re-adds sounds
* exception
* makes travis happy
2017-03-26 09:39:29 -04:00
