Commit Graph

233 Commits

Author SHA1 Message Date
deathride58
df1decf1b1 Merge pull request #8087 from Trilbyspaceclone/QoL-RCD
[MIRROR]  fixes some edge cases in rcd building #42960 TG code
2019-03-08 20:46:19 -05:00
Trilbyspaceclone
518bce82c0 Update plating.dm 2019-03-04 16:34:37 -05:00
kevinz000
5f0462b604 Update river.dm 2018-12-20 01:00:36 -08:00
Redtail
629189fdc1 Added Another new carpet, and two tables, and a new cargo crate.
Added:  monochrome.  Two new table sprites for the other new carpet.  New cargo supply crate for the two new carpets.  Changed:   the name of the new carpet to "blackred" so it would avoid confusion with the original carpet.
2018-12-07 22:48:46 -06:00
Redtail
e339bcd2ca Added a new carpet
Worked on adding a new carpet.  It isn't -finished- yet and Trilby is going to help look over what I've done so I can make this work.
2018-12-01 20:21:18 -06:00
deathride58
0ce450eab8 tgstation/tgstation#40662 - Stops using the rad insulation component to provide default rad insulation features in order to save a bit of memory 2018-10-02 19:36:21 -04:00
Poojawa
720b25c6f5 floor fixes and gun memes 2018-09-22 03:50:37 -05:00
Poojawa
d231018a3a Flashy flash and Gondola Pods
and cult effect addition, fixes CTF
2018-09-21 02:48:17 -05:00
Poojawa
bc0d14c193 Continual updates until merged 2018-09-17 04:55:03 -05:00
Poojawa
1a2460ed28 Continous update intergration until being merged
Also tgui fixes/updates
2018-09-15 00:37:29 -05:00
Poojawa
42db44b39e Alien Ruin fix, various cherrypicked upstream fixes
Also adds new buildmode
2018-09-13 22:55:11 -05:00
Poojawa
8b9ef1e400 Game folder 2018-09-11 04:06:45 -05:00
deathride58
3e18d8208e Updates to tgstation commit 78e471d 2018-07-05 01:22:27 -04:00
deathride58
91805b8789 and that just leaves the modules folder 2018-07-02 00:28:51 -04:00
Jordan Brown
a14bc0615d Merge pull request #38644 from AutomaticFrenzy/patch/cameranet
Port AI static to vis_contents
2018-06-25 20:23:32 -05:00
Tad Hardesty
27b80045ad Fix some of the Lavaland roundstart atmos active turfs (#38524) 2018-06-17 03:15:08 -05:00
LetterJay
351f43a392 Merge pull request #7113 from Citadel-Station-13/upstream-merge-38500
[MIRROR] Fixes attacking wooden walls
2018-06-16 16:17:28 -05:00
Emmett Gaines
1f3bbebe0a Moves arch component application to where archdrops is defined (#38487) 2018-06-16 06:17:48 -05:00
AnturK
460bcd399d Fixes attacking wooden walls (#38500) 2018-06-16 06:17:10 -05:00
CitadelStationBot
d875c362fa [MIRROR] Turf grammar omnibus (#7104)
* Turf grammar omnibus (#38375)

* Fix plurality and propriety on turfs

Some turfs are marked tentatively plural in order to avoid an incorrect
choice of "a" or "an".

* Add an article var to handle unusual a/an

* An additional pass on turf names

* Decapitalize server, mainframe, killroom floors

* Turf grammar omnibus
2018-06-13 19:31:29 -07:00
deathride58
e279392386 Merge pull request #6962 from Citadel-Station-13/upstream-merge-38128
[MIRROR] Standardizes and cleans up some admin messages & logging
2018-06-09 05:53:25 +00:00
CitrusGender
bd6fb5f9e5 New directional beach sprites and corners for the 2018 Summer Ball (#38262)
* Adds beach corners, interior corners, and other sides in addition to the normal down direction.

* SOMEONE LIED TO ME

* Update misc_plating.dm

* don't copy paste at 4am

* okay there we go
2018-06-04 00:47:45 -05:00
ShizCalev
4ae974644c Standardizes and cleans up some admin messages & logging 2018-05-31 22:41:31 -05:00
ShizCalev
4452dc4629 Corrects bronze floor & table's name (#38164) 2018-05-31 22:41:01 -05:00
deathride58
2f9e3e403d Hard upstream sync (#6951)
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
2018-05-31 16:03:18 -07:00
LetterJay
359d31238d Merge branch 'master' into upstream-merge-37486 2018-05-21 11:59:57 -05:00
LetterJay
931a950adb Merge branch 'master' into upstream-merge-37486 2018-05-21 08:59:32 -05:00
LetterJay
0758204515 Merge branch 'master' into upstream-merge-37476 2018-05-20 23:12:07 -05:00
vuonojenmustaturska
5e48fcd275 Merge pull request #37846 from DaxDupont/axe-time
Small cult nerf do not be alarmed robustin think about your heart
2018-05-16 04:46:59 -05:00
deathride58
50f8779fc0 Merge branch 'master' into upstream-merge-37486 2018-05-06 07:15:48 +00:00
deathride58
6a07a66cb3 Merge branch 'master' into upstream-merge-37476 2018-05-06 07:07:02 +00:00
Jordan Brown
a9d452a24d Merge pull request #37549 from ShizCalev/bounce_away-fixes
Resolved var name conflict for bounce_away()
2018-04-30 12:51:40 -05:00
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
vuonojenmustaturska
3f6167d08e Moves several clothing-specific flags from /atom to their proper type 2018-04-28 13:21:48 -05:00
oranges
7d45e045a3 Uppercases slot defines. 2018-04-27 20:14:39 -05:00
Poojawa
cc6b320f83 game folder 2018-04-23 00:17:28 -05:00
Jordan Brown
44df2b780e Merge pull request #37268 from ShizCalev/scp-ruin-fix
Fixes SCP ruin turret faction, fixes hostile mobs attacking turrets in the same faction
2018-04-18 11:34:06 -05:00
LetterJay
6b3a59b028 Merge pull request #6372 from Citadel-Station-13/upstream-merge-37117
[MIRROR] Removes some duplicated code
2018-04-14 07:45:15 -05:00
LetterJay
8e293a20aa Update asteroid.dm 2018-04-12 07:04:33 -05:00
ninjanomnom
5af97c3edc Removes some duplicated code 2018-04-11 15:01:10 -05:00
nicbn
f45a552c42 Code improvements on bullet damage decals (#36604)
Now fixing the dents is instant too

Maybe fixes #36601
2018-04-11 05:21:03 -05:00
deathride58
e0d7630c19 Merge branch 'master' into synctesting 2018-04-09 21:43:26 +00:00
vuonojenmustaturska
d0075b37b3 Fixes a turf runtime (#37038) 2018-04-08 19:22:14 -05:00
Poojawa
5fa001c10f things with stuff (#6233)
* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already
2018-04-07 23:07:09 -04:00
Grandmother of 50
2d710e863f Archaeology... .... Code Cleanup (One day I promise!) (#36490)
* Improves Arch Code

* defines and stack_traces null values

* relocates 2 defines to "non-signal" section
2018-04-02 18:14:15 -05:00
fludd12
7826515aed Walls made entirely of wood! (#36524)
* Buffs Lifebringers (And kind of botany.)

* Retools staff to use earthsblood as fuel, can now remove rock walls

* No more blessings!

* Dismantle the means of production.
2018-04-01 12:24:33 -05:00
CitadelStationBot
c8c7e6575b [MIRROR] fixes "Xeno acid melts lava" (#6063)
* fixes "Xeno acid melts lava" (#36584)

* fix

* im dumb

* fixes "Xeno acid melts lava"
2018-03-22 06:08:51 -05:00
CitadelStationBot
009f95db42 [MIRROR] Electronic assembly changes and additions (#6014)
* Electronic assembly changes and additions

* Electronic assembly changes and additions (#36394)

* the rainbow of mediocrity rides again

* whoops that wasn't supposed to be there
2018-03-19 21:11:23 -05:00
kevinz000
f78fea7333 [READY] Refactors wet floors to a component (#36130)
* Wet Floor components

* No more turf wet slide.
2018-03-17 07:53:11 -05:00
CitadelStationBot
64abde83eb [MIRROR] Cult Fixes and Minor Balance Tweaks (#5913)
* Cult Fixes and Minor Balance Tweaks (#36092)

* Fixes and Balance Tweaks

* Faster deconversions

* Shade nerf

* Cult Fixes and Minor Balance Tweaks
2018-03-12 07:01:54 -05:00