LetterJay
febefa0c78
Something I broke in a previous PR that I didn't see
2017-05-23 10:11:19 -05:00
LetterJay
958afdf037
oops
2017-05-23 06:29:15 -05:00
LetterJay
2fcc8fdc25
magic
2017-05-23 06:23:29 -05:00
LetterJay
2083b0c990
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27467
2017-05-23 05:31:00 -05:00
CitadelStationBot
6b4b6ee70d
Mesons no longer show turfs on lavaland, but miners no longer need mesons to see minerals scanned by a mineral scanner through walls
2017-05-22 22:21:20 -05:00
LetterJay
abbacd2c89
Merge branch 'master' into upstream-merge-27160
2017-05-22 16:29:43 -05:00
LetterJay
c414bcd26e
Update equipment.dm
2017-05-22 13:13:16 -05:00
LetterJay
3f62929340
Merge branch 'master' into upstream-merge-27379
2017-05-22 12:45:18 -05:00
LetterJay
3548ed5e3e
i'll fix this in another PR
2017-05-22 12:27:59 -05:00
LetterJay
73dea85b15
commit/rej cleanup
2017-05-22 11:24:17 -05:00
CitadelStationBot
8abbf12132
Resonator fields now visually show how long they have until they burst
2017-05-21 22:28:36 -05:00
kevinz000
7e2cebe1db
Merge branch 'master' into upstream-merge-27344
2017-05-21 17:50:29 -07:00
CitadelStationBot
cd82124ef5
Survival pod doors will properly turn if on shuttles ( #1070 )
2017-05-21 17:43:53 -07:00
CitadelStationBot
e224a47f53
Two more types of Legion and makes environment_smash levels into defines
2017-05-21 02:52:23 -05:00
Poojawa
45ba084c6a
Merge branch 'master' into upstream-merge-27344
2017-05-20 23:26:28 -05:00
CitadelStationBot
5455e28d76
Aux Base Fixes ( #1067 )
2017-05-20 23:20:45 -05:00
CitadelStationBot
448dc20c2b
Proto-kinetic crushers are significantly better
2017-05-20 12:42:11 -05:00
CitadelStationBot
a430e24555
Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual
2017-05-18 16:38:09 -05:00
CitadelStationBot
d5b0150e99
Buffs hierophant club
2017-05-18 16:36:38 -05:00
CitadelStationBot
0ad1bb5259
Adds a disk slot to the ORM, to allow the uploading of new smelter designs ( #980 )
2017-05-18 11:53:47 -05:00
CitadelStationBot
230b2e6fc8
Fixes the ore redemption machine's sheet amount upgrade
2017-05-14 18:43:32 -05:00
LetterJay
d64e569d6c
Merge pull request #954 from Citadel-Station-13/upstream-merge-27199
...
[MIRROR] Free Golems can purchase their own royal capes
2017-05-14 16:27:25 -04:00
LetterJay
52fa1f314f
Merge branch 'master' into upstream-merge-26760
2017-05-14 01:02:26 -04:00
CitadelStationBot
73101cbd88
Free Golems can purchase their own royal capes
2017-05-13 21:17:37 -05:00
CitadelStationBot
ccf4550ac1
Lavaland Loot: Cursed heart upgraded to wizard version, New loot item that grants omnitongue ( #890 )
2017-05-10 16:04:21 -07:00
kevinz000
bd8bfe1327
Merge pull request #684 from Citadel-Station-13/upstream-merge-26728
...
[MIRROR] A bunch of sparks to do_sparks [Travis error unrelated to PR]
2017-05-07 22:41:24 -07:00
CitadelStationBot
d7bdb49283
ORM fixes
2017-05-06 16:20:39 -05:00
LetterJay
a57190b9c5
Merge pull request #694 from Citadel-Station-13/upstream-merge-26708
...
[MIRROR] Ore redemption machine cleanup
2017-05-02 12:26:28 -05:00
LetterJay
6310292531
woo
2017-05-02 11:19:14 -05:00
LetterJay
3b8484b52b
Merge pull request #579 from Citadel-Station-13/upstream-merge-26129
...
[MIRROR] Unorphans the blackbox
2017-05-02 05:13:49 -05:00
CitadelStationBot
036109de58
Changes a bunch of hrefs to the proper defines
2017-05-02 02:20:07 -05:00
CitadelStationBot
e2a95703de
Ore redemption machine cleanup
2017-05-01 11:54:33 -05:00
CitadelStationBot
55b9c06e63
A bunch of sparks to do_sparks
2017-05-01 08:36:04 -05:00
LetterJay
991fb8335c
manual merge
2017-04-29 11:42:28 -05:00
CitadelStationBot
4da7414339
Old ore processor cleanup
2017-04-29 03:46:03 -05:00
CitadelStationBot
bde5d6253a
Unorphans the blackbox
2017-04-26 17:05:23 -05:00
CitadelStationBot
a905c15dad
Replaces /image with /mutable_appearance ( #556 )
...
* Replaces /image with /mutable_appearance, where appropriate
* Update miscellaneous.dm
* Delete miscellaneous.dm.rej
* Delete pet.dm.rej
* Update pet.dm
* Update species.dm
* Update miscellaneous.dm
* Update species.dm
* Update miscellaneous.dm
* Delete species.dm.rej
* Update species.dm
pretty sure I got all the indentation correct THIS time, ffs
* Update species.dm
* Update species.dm
fucking tabs man, fucking tabs.
2017-04-26 08:18:35 -05:00
CitadelStationBot
01f99160ad
Prevents fultons from transporting items out of inventories
2017-04-21 17:26:04 -05:00
CitadelStationBot
e832d79be9
Fixes some closets populating in New() ( #497 )
2017-04-20 22:03:09 -05:00
LetterJay
98463ad892
Merge pull request #469 from Citadel-Station-13/upstream-merge-26320
...
[MIRROR] [s] Fixed ORM exploit
2017-04-18 20:34:04 -05:00
CitadelStationBot
bc6c48d009
[s] Fixed ORM exploit
2017-04-18 18:15:09 -05:00
CitadelStationBot
0c19ba163e
Arbitary code cleaning
2017-04-18 18:05:33 -05:00
CitadelStationBot
64068fc614
Proximity sensing refactor ( #425 )
2017-04-16 18:15:29 -04:00
CitadelStationBot
c38fa1eaa3
Finally kills off my old nemesis of the old fashioned inconsistent shuttle paths ( #410 )
2017-04-15 15:01:54 -04:00
Poojawa
9e72b1b8fd
/tg/ 4/14 ( #367 )
...
* outside code stuff
* defines, helpers, etc
* everything not module
* modules
* compiled fixes + missing sounds
2017-04-14 23:28:04 -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
katnep
31d0f4cb1f
Mining Vendor Redo ( #298 )
...
* Mining Vendor Redo
basically Re adds all the stuff i added back at the start of 6th port,
also re added stimpacks to the lsit becuase i don't see why they needed
to be removed from it
* whetstone removed
whetstone removed
* price balances
just tweaked the prices of the new bundles to make them actually worth
purchasing following a 5 for the price of 4 standard
* The final change
finishes the requested changes
* removes excessive line spacing
* removes trailing comma
2017-03-29 17:11:00 -04: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
Poojawa
f67e9f6d87
Bleeding edgy refresh ( #303 )
...
* not code stuff
* other things
* global vars, defines, helpers
* onclick hud stuff, orphans, world.dm
* controllers and datums
* game folder
* everything not client/mobs in modules
* client folder
* stage 1 mob stuff
* simple animal things
* silicons
* carbon things
* ayylmaos and monkeys
* hyoomahn
* icons n shit
* sprite fixes
* compile fixes
* some fixes I cherrypicked.
* qdel fixes
* forgot brain refractors
2017-03-21 11:44:10 -05:00
TalkingCactus
97327d2beb
Hotfixes for March 3, 2017 ( #260 )
...
* fixes sterile mask box
* fixes admin map templates
https://github.com/tgstation/tgstation/pull/24581
* syndicate beacon refactor
https://github.com/tgstation/tgstation/pull/24612
* singularity tracking
https://github.com/tgstation/tgstation/pull/24609
* puddle description
https://github.com/tgstation/tgstation/pull/24601
* aux base landing fix
https://github.com/tgstation/tgstation/pull/24594
* comms console cooldown
https://github.com/tgstation/tgstation/pull/24579
* cult fixes + pronouns
https://github.com/tgstation/tgstation/pull/24590
* minebots now check for pressure
https://github.com/tgstation/tgstation/pull/24604
* fixes a very annoying spawn
https://github.com/tgstation/tgstation/pull/24588
* fixes false positive AI cheat check
https://github.com/tgstation/tgstation/pull/24558
mso is bae
* Fixes abductor surgery designs
https://github.com/tgstation/tgstation/pull/24593
* Allows transit space shuttle repairs
https://github.com/tgstation/tgstation/pull/24582
* fixes indentation error
2017-03-03 15:15:42 -05:00
