Commit Graph

62 Commits

Author SHA1 Message Date
CitadelStationBot
226fdf9040 Remaps seed vault, adds bees and changes cherry to cherry bomb in random seed spawn (#973) 2017-05-14 20:12:00 -07:00
LetterJay
6718ea096d Merge pull request #937 from Citadel-Station-13/upstream-merge-27148
[MIRROR] Buffs honey
2017-05-14 16:30:51 -04:00
CitadelStationBot
4a67fe55a4 Buffs nitrous oxide 2017-05-14 07:39:05 -05:00
LetterJay
52fa1f314f Merge branch 'master' into upstream-merge-26760 2017-05-14 01:02:26 -04:00
CitadelStationBot
b9ad2c31c9 Buffs honey 2017-05-13 18:00:53 -05:00
LetterJay
485bca003f Merge pull request #640 from Citadel-Station-13/upstream-merge-26527
[MIRROR] Zombie/limb refactors/fixes
2017-05-13 01:24:55 -04:00
CitadelStationBot
4a818bee1f Adds Sticks of Butter, Mayonnaise, and Mix function to grinder (#896) 2017-05-10 16:16:48 -07: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
e3f123d5bb Merge pull request #821 from Citadel-Station-13/upstream-merge-26970
[MIRROR] Fixes an inconsistency with the Banana Honk drink
2017-05-07 19:19:44 -07:00
CitadelStationBot
61a7897962 Plastic sheet production - Chemistry recipe 2017-05-07 18:23:05 -05:00
CitadelStationBot
27e7434320 Fixes an inconsistency with the Banana Honk drink 2017-05-07 08:54:02 -05:00
kevinz000
52f5226547 Merge pull request #750 from Citadel-Station-13/upstream-merge-26851
[MIRROR] Fixes runtime with null nutriment taste data
2017-05-06 22:00:16 -07:00
kevinz000
035dd93158 Merge pull request #756 from Citadel-Station-13/upstream-merge-26848
[MIRROR] Adds spewium toxin in traitor kits
2017-05-06 21:43:08 -07:00
kevinz000
bfe7441f9b Merge pull request #791 from Citadel-Station-13/upstream-merge-26867
[MIRROR] Holy water will now properly make you jittery
2017-05-06 15:41:24 -07:00
kevinz000
b6231af063 Merge pull request #682 from Citadel-Station-13/upstream-merge-26731
[MIRROR] Buffs mercury and lithium [Travis error unrelated to PR]
2017-05-06 14:08:51 -07:00
CitadelStationBot
10846d5d37 Replaces stun/weaken from Miner's salve 2017-05-06 10:48:07 -05:00
CitadelStationBot
b993d9ad23 Holy water will now properly make you jittery 2017-05-05 18:33:34 -05:00
CitadelStationBot
46d7976488 Adds spewium toxin in traitor kits 2017-05-04 17:53:42 -05:00
CitadelStationBot
36b517d2ba Fixes runtime with null nutriment taste data 2017-05-04 13:32:01 -05:00
CitadelStationBot
8a221b9637 Ports pastries to Initialize 2017-05-03 05:55:15 -05:00
LetterJay
91cb42cf60 Merge pull request #699 from Citadel-Station-13/upstream-merge-26556
[MIRROR] Saline-glucose changes
2017-05-02 18:44:53 -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
LetterJay
b57a4aa6b4 Merge branch 'master' into upstream-merge-26386 2017-05-01 15:27:25 -05:00
CitadelStationBot
3e80105ffb Saline-glucose changes 2017-05-01 12:55:45 -05:00
CitadelStationBot
ace93b6cfd Buffs mercury and lithium 2017-05-01 08:34:51 -05:00
CitadelStationBot
87e306851d Readds deepstorage w/ tweaks AND adds water bottles to vending machines 2017-05-01 07:24:41 -05:00
LetterJay
06bfa8770e Merge branch 'master' into upstream-merge-26129 2017-04-29 11:45:37 -05:00
LetterJay
991fb8335c manual merge 2017-04-29 11:42:28 -05:00
CitadelStationBot
daeba2eec7 Zombie/limb refactors/fixes 2017-04-28 21:05:06 -05:00
LetterJay
22440109e2 Merge pull request #598 from Citadel-Station-13/upstream-merge-26605
[MIRROR] Adds crayon grinding
2017-04-27 12:48:27 -05:00
CitadelStationBot
870ee9ca6c Minor IV/bloodbag grammar fixes 2017-04-27 09:21:57 -05:00
CitadelStationBot
83916bee5d Adds crayon grinding 2017-04-27 09:17:44 -05:00
CitadelStationBot
bcab389ca2 New() goes in the trash, we've gotta Initialize() 2017-04-26 17:15:48 -05:00
CitadelStationBot
bde5d6253a Unorphans the blackbox 2017-04-26 17:05:23 -05:00
CitadelStationBot
87ce25df9b Removes a unused chem (#576) 2017-04-26 11:09:00 -05:00
CitadelStationBot
84321916a5 Refactors ears into organs (#513)
* Refactors ear damage into ear organs

* Update human.dm

* Update species.dm

* Delete species.dm.rej

* Update tgstation.dme

* Delete tgstation.dme.rej

* Delete human.dm.rej

* Update tongue.dm

* Delete surgery.dmi

* upload fixed surgery.dmi
2017-04-26 09:52:35 -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
d89b67a9e2 Fixes gold and light pink slime extracts 2017-04-21 17:19:42 -05:00
CitadelStationBot
7c83a27610 Prevents mutation toxin from working on nonhumans, removes a spawn 2017-04-19 04:33:47 -05:00
CitadelStationBot
841f50a769 Fixes a bug (#427) 2017-04-16 18:16:40 -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
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
Poojawa
0bca862419 Overhauls and 2/28 sync (#244)
* map tweaks/shuttle engines

* helpers and defines

* global/onclick

* controllers and datums

* mapping

* game folder

* some other stuff

* some modules

* modules that aren't mobs

* some mob stuff

* new player stuff

* mob living

* silicon stuff

* simple animal things

* carbon/ayylmao

* update_icons

* carbon/human

* sounds and tools

* icons and stuff

* hippie grinder changes + tgui

* kitchen.dmi

* compile issues fixed

* mapfix

* Mapfixes 2.0

* mapedit2.0

* mapmerger pls

* Revert "mapedit2.0"

This reverts commit 74139a3cacea10df7aafca06c0a10bd3daf3a481.

* clean up vore folder + 2 hotfixes

* admin ticket refinement

* Blob tweaks and LAZYADD

* LAZYADD IS LAZY

* Magic strings purged

* DEFINES NEED HIGHER PRIORITIES

* Only a sleepless idiot deals in absolute TRUE|FALSE

* u h g

* progress bar fix

* reverts ticket logs

* there's always that one guy

* fixes and stuff

* 2/27 fixes

* game folder stuff

* stats

* some modules again

* clothing stuff

gets vg clothing out of the main files

* everything not mobs again

* mob stuff

* maps, tgui, sql stuff

* icons

* additional fixes and compile errors

* don't need this anymore

* Oh right this isn't needed anymore

* maint bar re-added

* that doesn't need to be here

* stupid events

* wtfeven

* probably makes Travis happy

* don't care to fix the grinder atm

* fixes vending sprites, changes turret

* lethal, not lethals

* overylays are finicky creatures

* lazy fix for bleeding edgy (#252)

* map tweaks/shuttle engines

* helpers and defines

* global/onclick

* controllers and datums

* mapping

* game folder

* some other stuff

* some modules

* modules that aren't mobs

* some mob stuff

* new player stuff

* mob living

* silicon stuff

* simple animal things

* carbon/ayylmao

* update_icons

* carbon/human

* sounds and tools

* icons and stuff

* hippie grinder changes + tgui

* kitchen.dmi

* compile issues fixed

* mapfix

* Mapfixes 2.0

* mapedit2.0

* mapmerger pls

* Revert "mapedit2.0"

This reverts commit 74139a3cacea10df7aafca06c0a10bd3daf3a481.

* clean up vore folder + 2 hotfixes

* admin ticket refinement

* Blob tweaks and LAZYADD

* LAZYADD IS LAZY

* Magic strings purged

* DEFINES NEED HIGHER PRIORITIES

* Only a sleepless idiot deals in absolute TRUE|FALSE

* u h g

* progress bar fix

* reverts ticket logs

* there's always that one guy

* fixes and stuff

* 2/27 fixes

* game folder stuff

* stats

* some modules again

* clothing stuff

gets vg clothing out of the main files

* everything not mobs again

* mob stuff

* maps, tgui, sql stuff

* icons

* additional fixes and compile errors

* don't need this anymore

* Oh right this isn't needed anymore

* maint bar re-added

* that doesn't need to be here

* stupid events

* wtfeven

* probably makes Travis happy

* don't care to fix the grinder atm

* fixes vending sprites, changes turret

* lethal, not lethals

* overylays are finicky creatures
2017-02-28 09:30:49 -06:00
TalkingCactus
be40ffe334 usr << to O.visible_message() (#246) 2017-02-25 12:06:51 -05:00
TalkingCactus
36c580c236 The Update (#241)
* auto vote runtime error fix

* part 1

* adds a wolf pai sprite

modified fox sprite that doesn't make your eyes bleed

* missed a painful sprite

* part 2

* ptwhatever

* save

* conflict resolution pt1

* conflict resolution pt2

* almost done with the preferences shit

* fixes missing arousal HUD

* file rename

* even more

* keep the panic commits coming

* forgot one

* wew, gonna go make some small changes

* s o o n

* LOOC admin and player toggles

* fixed backpacks and taurs clipping on the preview

* fixed penis length saving

* typo fix

* arousal fix

* icon tuning

* final
2017-02-24 21:42:15 -05:00
Poojawa
fc2dbcd9fe Tg port 2 15 (#230)
* defines/helpers

* globalvars, onclick, controllers

* datums and game

* woooooooooorld. Uh. dm

* modules sans mobs client admin

* modules/admin

* pref shit

* modules/mob

* icon updates

* extra things

* Cherrypicked fixes from open PRs

* metastation.tgm fix

* a better meta fix

* reverts async breakings
2017-02-15 03:35:32 -06:00
Poojawa
6674f9fc15 Tg 2 11 sync (#215)
* first series of updates

* datums

* games folder

* admin and atmosia stuffs

* moar

* mob updates borg riding

* sprites and stuff

* fixes for various things

* oops. some missed fixes
2017-02-12 03:56:14 -06:00