Commit Graph

42 Commits

Author SHA1 Message Date
cebutris
44908503bf Stunswords! (#5179)
* adds in stunswords

* inhands!

* fixes cell charge text.

* adds in the kit and also fuck admin.txt

* Fixes some formatting

* replaces the placeholder icon with

* i hate everything

* tries to fix the dme. hopefully.

* tries again
2018-02-04 22:10:21 -06:00
deathride58
142e96a2dd [READY] Adds night shifts (#4281)
* initial commit - adds night shifts

* fixes lighting not updating when nightshift is triggered and fixes compiling issues

* makes red alert override nightshift

* Update lighting.dm

* adds announcements for nightshift changes

* fixes nightshift flip-flopping during the night, adjusts night message a little, moves from minor_announce to priority_announce

* Update cit_nightshift.dm

* fixes compiling errors
2018-02-04 21:28:41 -06:00
Poojawa
d7659ac6b2 sync with master 2018-01-31 07:02:55 -06:00
Poojawa
fb5de29784 cleanup of game folder, other fixes 2018-01-31 06:39:18 -06:00
LetterJay
5ff485d4bf Merge pull request #5182 from improvedname/packs
Adds kinkmate refill packages to cargo
2018-01-31 04:06:57 -06:00
Improvedname
3db7412fb7 adds loudout stuff... 2018-01-30 15:10:04 +01:00
Improvedname
ac17f58d3d adds kink refill packs 2018-01-29 21:00:32 +01:00
Poojawa
03086dfa91 Tg 1 28 sync testing/confirmation (#5178)
* maps, tgui, tools

* defines and helpers

* onclick and controllers

* datums

fucking caught that hulk reversal too.

* game and shuttle modular

* module/admin

* oh god they fucking moved antag shit again

* haaaaate. Haaaaaaaaaate.

* enables moff wings

* more modules things

* tgstation.dme

before I forget something important

* some mob stuff

* s'more mob/living stuff

* some carbon stuff

* ayy lmaos and kitchen meat

* Human stuff

* species things

moff wings have a 'none' version too

* the rest of the module stuff.

* some strings

* misc

* mob icons

* some other icons.

* It compiles FUCK BORERS

FUCK BORERS
2018-01-29 04:42:29 -06:00
deathride58
28bd203f41 Merge pull request #5118 from Citadel-Station-13/supply-console-security
Restricts Supply Console to Quatermaster access
2018-01-29 02:28:07 +00:00
cebutris
b2a5caa5ba Lavaknights now get polychromatic ID badges [READY!] (#5015)
* adds IDs to cammy's catknights

* sets the ID as a subtype for easier asset changing

* Makes lavaknight captains more captain-y

* icons!

* It's okay I'm only mildly an idiot

* Knight Badges are called Knight Badges

* Polychromes them hecking badges

* Polychromes them hecking badges

* Makes them work!

* moves the id to their own file

* how did I fucking miss this am I just that much of an idiot

* removes unnecessary copypaste

* they're not id cards i swear
2018-01-26 10:50:08 -06:00
Poojawa
d1a07c4d3e Appeases Bhijn. Booty call requested. 2018-01-26 09:28:36 -06:00
deathride58
a1aa60188c Merge pull request #4907 from Vivinet/Potat-OS
Craftable Intellicard Alt: Potat-OS
2018-01-18 23:05:21 +00:00
LetterJay
91299a6152 Merge pull request #4838 from deathride58/loadoutsystem
[READY FOR TESTMERGE] Ports Hippie's loadout system
2018-01-18 15:32:00 -06:00
Vivinet
1cf142a7e4 Craftable Intellicard Sprite: Potat-OS
- Adds the Potat-OS, a Portal inspired way to card AI's! Functionally identical to the intellicard, now with a %100 more starch.

- Crafted using a cable coil, a metal rod, an intellicard and a potato and found in the robot crafting menu.
2018-01-17 21:28:06 -08:00
deathride58
e22b022e98 Merge pull request #4902 from Vivinet/Vivinet
Mining Droid + Borg Tank Tread Movement
2018-01-18 04:59:24 +00:00
deathride58
80f3c9a6da hrmm 2018-01-17 17:58:42 -05:00
deathride58
5fd8606a3f migrates donor items to loadout system, comments out handle_roundstart_items, plus fixes 2018-01-17 17:19:54 -05:00
Vivinet
87c1f34536 Requested changes and then some
- Moved all modified sprites to modular_citadel, made overrides for sec-tread and eng-tread, reverted original robots.dmi

- Added open cover states to modular_citadel robots.dmi

- Removed light found on normal engi-borg sprite that was not on the tread version.
2018-01-17 13:03:57 -08:00
Vivinet
4d05dc1829 Mining Droid + Borg Tank Tread Movement
- Adds the mining droid sprite to the default mining borg module selection.

- Adds movement states for both security and engineering tank tread sprites.

- Fixed static security tread state sprite.
2018-01-17 11:52:47 -08:00
theTiji0
1dcdb82a25 minor touch ups and cleaning up the files 2018-01-16 16:41:51 -05:00
deathride58
b74518a24a adds more loadout equipment, adds working ckey whitelist system, and more 2018-01-16 16:23:22 -05:00
theTiji0
ffec849631 ghosts can now control these bastards 2018-01-16 00:17:58 -05:00
deathride58
b55a497ffc IT WORKS! its testmergable, just gotta add in a ckey whitelist system and add casual friday, then its good 2018-01-15 01:02:35 -05:00
theTiji0
0e33f5b6de Banana spiders are now available through botany. 2018-01-14 22:50:06 -05:00
deathride58
036dc82e12 initial commit - initial pref edits and file copypasting from hippie 2018-01-13 15:45:08 -05:00
deathride58
92d6f3d761 modularizes mining shuttle console id lock 2018-01-04 13:17:40 -05:00
deathride58
a8742c5799 fixes swarmer event disable regression, modularizes flyperson-only hulk 2018-01-04 13:00:44 -05:00
deathride58
1e1f83d945 fixes compiling errors and string regressions 2018-01-04 10:24:57 -05:00
deathride58
d8facb3bce initial commit - game folder + maps + dme 2018-01-03 22:52:38 -05:00
deathride58
04f19ea53d ACTUALLY FIXES VORE 2018-01-01 20:18:43 -05:00
LetterJay
5486f71010 woo 2018-01-01 07:30:50 -06:00
LetterJay
dd0a5c9d24 Merge pull request #4599 from cebutris/guardianstuff
blacklists holoparasites from discounting
2018-01-01 04:26:34 -06:00
deathride58
d249bf886a Fixes vore not functioning 2017-12-30 18:23:25 -05:00
cebutris
76a135fbb7 WRONG THING OOPS 2017-12-30 13:50:59 -05:00
cebutris
90b67e2e13 blacklists holoparasites from discounting 2017-12-30 13:35:26 -05:00
LetterJay
c7db4e8310 also syncs a bunch of shit 2017-12-29 04:12:43 -06:00
deathride58
3df98e631b Fixes compiling errors 2017-12-28 16:13:30 -05:00
deathride58
2fdb9e598f Modularizes dogborgs, adds new alternate skins for some modules, and more! 2017-12-28 15:50:33 -05:00
LetterJay
f3390aee98 Merge branch 'master' into NEB-consolidation 2017-12-17 20:37:34 -06:00
Michiyamenotehifunana
e77c1a8a07 Consolidates NEB code into a modular package 2017-12-15 16:57:22 +08:00
deathride58
de1c378621 restores the PDA sprites by cecily and toriate 2017-12-12 21:39:33 -05:00
deathride58
47960ab931 fixes conflict with base cit code, modularizes citadel uplink items file 2017-12-04 17:07:28 -05:00