Commit Graph

59 Commits

Author SHA1 Message Date
deathride58
2ee4d3e77d Merge pull request #6515 from Citadel-Station-13/upstream-merge-37326
[MIRROR] Removes SCP_294
2018-04-27 09:35:43 +00:00
Armhulen
17aa0acef8 Removes SCP_294 (#37326)
* aaah sweet essence

* bye bye sprites

* goodbye machine code

* bye bye blacklist entry

* whoops

* scp gone from runtime

* bye bye ract

* bye bye space ruin folder

* bye bye area
2018-04-25 10:05:57 -05:00
Poojawa
cc6b320f83 game folder 2018-04-23 00:17:28 -05:00
CitadelStationBot
766b85908e [MIRROR] Adds the Ancient Cloning Lab ruin (#5814)
* Adds the Ancient Cloning Lab ruin

* fixes conflicts
2018-03-05 15:20:49 -06:00
vuonojenmustaturska
7214836012 Merge pull request #35734 from ShizCalev/path-cleanup
Cleans up unused /area paths
2018-02-17 09:39:20 -06:00
MoreRobustThanYou
73c1088d5a Adds a SCP-294 ruin 2018-02-11 05:13:56 -06:00
MMMiracles
2d499b938c adds that farm your dad talked about sending your old pet catperson to so they could live out the rest of their lives free (#35168)
* adds a space ruin for where dad tells you they sent your pet catperson to live on a farm where they can be free and chase all the grayshirts they want

* dirty vars

* Vars

* changes windoor to proper subtype, removed extra circular saw

* area/space to area/ruin/unpowered, added gps tag

* in area/space nobody can hear you scream

* Update mrow_thats_right.dmm

if i scream, scream, scream, about a good man's life, would you ever stop and listen, would you open up your eyes

* cat
2018-02-07 20:23:32 -06:00
Poojawa
d7f8b8fbe4 dme enabling 2018-01-31 07:17:21 -06:00
Poojawa
fb5de29784 cleanup of game folder, other fixes 2018-01-31 06:39:18 -06: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
oranges
c9afc3e53d Merge pull request #34319 from ShizCalev/travis-maps
Fails travis on common mapping mistakes
2018-01-16 14:37:26 -06:00
WJohn
16596405e1 Remakes the space syndicate listening post. (#34309)
* Remakes the space syndicate listening post. TGM in a second.

* TGM of the map

* Removes space suit from EVA.

* Removes bed and dirty var.
2018-01-15 07:18:15 -06:00
deathride58
d8facb3bce initial commit - game folder + maps + dme 2018-01-03 22:52:38 -05:00
Cruix
ab408d3e97 Made atoms not smooth with shuttles (#33807)
* Made atoms not smooth with shuttles

* Shuttle area canSmoothWithAreas is automatically assigned to the area's type if it is null

* Moved pirate shuttle areas into the multi-area shuttles section
2017-12-29 00:29:04 -06:00
Emmett Gaines
a1ec5538a6 Arena shuttle teleport fix (#33777) 2017-12-25 19:12:20 -06:00
LetterJay
7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
kevinz000
253c819bc1 TG Sync 12/15/17
s

s
2017-12-15 06:27:57 -08:00
LetterJay
16019df886 Merge branch 'master' into upstream-merge-32280 2017-11-15 10:21:04 -06:00
LetterJay
36778e9404 Merge pull request #3919 from Citadel-Station-13/upstream-merge-32623
[MIRROR] Adds ambience for Reebe.
2017-11-13 11:53:21 -06:00
Qustinnus
182b81a721 Adds ambience for Reebe. (#32623)
* spooky

* fix 1

* fix 2
2017-11-13 03:45:03 -06:00
Emmett Gaines
3c35202b5e Performance and usability improvement for blueprints 2017-11-13 03:32:35 -06:00
oranges
43113cd9b5 Merge pull request #31947 from AnturK/yarr
How does this work:
Station receives a communication extorting current cargo point, if they answer yes the points are just gone and nothing of interest happens.

If station refuses to pay or is silent for 3 minutes, pirate shuttle spawns somewhere in space.

    There's an internal GPS onboard so crew will always be able to follow the shuttle.
    Crew of 3, moderately armed. (Balance pending)
    Shuttle engines have 3 minute cooldown between jumps.
    Special shuttle equipment will block cargo and emergency shuttles from leaving and slowly steal the points.
2017-11-13 03:19:38 -06:00
Qustinnus
d475149e8d Adds around 30 new ambience sounds, and changes ambience code a little bit 2017-11-03 15:53:09 -05:00
ShizCalev
dbba59e0b5 Makes luxurious emergency shuttle noteleport 2017-10-25 23:39:41 -05:00
WJohn
4b3f578633 Readds the boxstation whiteship as a ruin. (#31709)
* Adds box's whiteship back as a broken down relic.

* And accompanying files to make it work.

* Derp
2017-10-15 11:31:48 -05:00
ShizCalev
74c9b75ba1 Refactors away mission & space ruin area code. 2017-10-12 12:46:52 -05:00
LetterJay
86edafb132 lol 2017-10-09 01:06:50 -05:00
Ashe Higgs
e575bd6685 (Ready) Clockwork Cult Rework: Proof-of-concept 2017-09-26 15:22:09 -05:00
CitadelStationBot
3b144c423c [MIRROR] Fix CentCom issues (#2619)
* Fix CentCom issues

* Actually ports fixes
2017-09-13 20:43:11 -05:00
kevinz000
c638386507 Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)
* fuck pubby

* fuck you too ceres

* ree

* this is going to be a disaster isn't it

* disaster

* dme

* -_-

* tg

* woops

* proper sync

* Welcome to conflict hell.

* lets hope this fixes more things than it breaks

* gdi

* goddamnit
2017-08-24 21:07:58 -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
CitadelStationBot
87b3df3069 Replace all secondary flags with bitflags stored in the flags_2 var 2017-08-17 09:19:14 -05:00
CitadelStationBot
cdbaf5c4e8 Standardized CENTCOM spelling 2017-08-08 09:05:44 -05:00
CitadelStationBot
8a4ddbe8a8 [MIRROR] Ports Rapid Cable Layers from /vg/ and paradise (#2162)
* Ports Rapid Cable Layers from /vg/ and paradise

* rej clean up + manual sync

* maps and .rej file cleanup

* sprite and WGW memes

* actual spellchecked memes

* some other map fix memes

* fuck it, let's just hard sync maps

* dumb paperwork shit for maps

* Revert "dumb paperwork shit for maps"

This reverts commit 8e70bbec0f407c334cd81f5b92aafdb90544ca9d.

* *autistic screeching*

* REEEEEEEEEEEEEEEEEEEEE

* Fuck off I want to do something else
2017-08-02 04:56:44 -05:00
CitadelStationBot
a72962c300 Made some object lists less terrible to read 2017-07-18 09:44:43 -05:00
CitadelStationBot
ff6bbbedf5 Changes some 1s and 0s to TRUE and FALSE (#1967) 2017-07-10 16:13:16 -07:00
Poojawa
b1b4826c0c July 5th TG sync (#1883)
July 5th TG sync
2017-07-05 22:14:19 -05:00
CitadelStationBot
d4c54bb0b5 Ancient Space Station [Space Spawn Ruin] 2017-06-25 11:03:27 -05:00
LetterJay
813bcc2b8d commit 2017-06-14 11:16:54 -05:00
CitadelStationBot
c9e8454c3b Deepstorage Ruin Revamp (#1407) 2017-06-13 13:42:03 -07:00
CitadelStationBot
79ff2672b4 [MIRROR] Clean snow, lavaland, and thunderdome (#1261)
* Clean snow, lavaland, and thunderdome

* Delete mining.dm.rej
2017-06-02 22:01:46 -07:00
LetterJay
1763c4b65d Merge pull request #1114 from Citadel-Station-13/upstream-merge-27530
[MIRROR] Area Refactor + Var-edit Cleanup
2017-05-30 20:49:42 -05:00
LetterJay
adb7a9b6ff rej clean up
more areas
2017-05-30 20:08:53 -05:00
LetterJay
0fe4a33b15 Merge pull request #1100 from Citadel-Station-13/upstream-merge-27453
[MIRROR] [All stations] Cleaned up var-editted areas
2017-05-30 19:50:35 -05:00
CitadelStationBot
87593dd8f7 Lavaland - Ruins now have lights 2017-05-30 14:46:30 -05:00
CitadelStationBot
6b6a156c2f Lavaland Lighting Fix + ruin varedit cleanup (#1257) 2017-05-28 15:27:50 -07:00
CitadelStationBot
3ed1975dda Fixes dirty in lavaland (#1227) 2017-05-27 13:31:13 -07:00
CitadelStationBot
efa9de6da9 Area Refactor + Var-edit Cleanup 2017-05-22 22:08:35 -05:00
CitadelStationBot
db4b764aea [All stations] Cleaned up var-editted areas 2017-05-21 22:29:41 -05:00