c7a2565255
stop this nonsense
2024-01-05 00:28:56 -03:00
695835fcd6
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload)
2022-04-09 00:03:13 -03:00
586a035132
Update files
2022-04-06 18:41:31 -03:00
189716314f
Would you like some defines in these trying times?
2022-03-23 12:10:02 -03:00
5029af901b
Upload files
2022-02-25 16:58:09 -03:00
50be57f107
grrrr
2021-12-08 18:33:06 +01:00
82ccfc40dc
/obj/screen --> /atom/movable/screen
2021-07-29 13:57:19 +03:00
98d3ac80d9
:pika:
2020-07-20 11:25:17 -07:00
6ee63f66aa
whew
2020-07-07 20:48:54 -07:00
8cb15f9279
Actually Balanced and Standardized Vendor Prices. ( #12495 )
2020-06-09 22:22:53 -07:00
b43a2861b6
Update watertank.dm ( #12283 )
2020-05-20 18:47:41 -07:00
b2a20d5438
reducing some prices as training wheel.
2020-05-03 05:37:04 +02:00
4c6f1b622b
Porting Goofconomy & co.
2020-04-17 07:48:11 +02:00
42ff9b1d35
Final test, fixes and parent calls.
2020-04-14 01:23:26 +02:00
2b4b626fac
support for items that switch states through update_icon.
2020-03-10 16:55:30 +01:00
e5e2e4f012
Merge pull request #10329 from Ghommie/Ghommie-cit490
...
Ports reagents id removal and typepath usage.
2020-01-10 01:34:39 +00:00
e74339ce8b
Jfc that's a lot of work!
2019-12-23 04:24:13 +01:00
3fcb7808fd
args
2019-12-13 02:30:17 +01:00
e991328087
progress
2019-10-19 15:02:56 +02:00
7aac9e6280
Updates reagents a bit.
2019-06-07 06:27:04 +02:00
8b9ef1e400
Game folder
2018-09-11 04:06:45 -05:00
3e18d8208e
Updates to tgstation commit 78e471d
2018-07-05 01:22:27 -04:00
91805b8789
and that just leaves the modules folder
2018-07-02 00:28:51 -04:00
9acc97dabe
Merge pull request #38496 from AutomaticFrenzy/patch/mirage-borders
...
Fix being able to pull mirage borders, others
2018-06-16 15:50:27 -05:00
4ae974644c
Standardizes and cleans up some admin messages & logging
2018-05-31 22:41:31 -05:00
ea9b3622fd
Merge branch 'master' into upstream-merge-37476
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2018-05-20 23:11:16 -05:00
23f6567872
Fixes defibs/watertanks/gatling lasers ( #37792 )
2018-05-13 06:13:45 -05:00
7d45e045a3
Uppercases slot defines.
2018-04-27 20:14:39 -05:00
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
f9353da855
Quote the armor lists
2018-02-16 00:26:26 -06:00
ed6ec3d63a
Removes some hrefs from logging ( #34310 )
...
* Removes key_name_admin calls from logging
* Removes JMP from gibtonite reaction logs
2018-01-12 07:04:39 -06:00
d8facb3bce
initial commit - game folder + maps + dme
2018-01-03 22:52:38 -05:00
522b8383d8
[READY]Refactors reagent container types
2017-12-18 22:54:51 -06:00
fcceb5ec77
Finishes the forceMove port
2017-12-14 15:40:08 -06:00
7f90427a40
Replaces a bunch of loc assignments with forcemoves and moves to nullspace
2017-12-13 13:56:57 -06:00
9806de310d
Remove NODROP from water tank misters ( #32995 )
2017-11-24 12:59:25 -06:00
831dde525e
Makes drinking glasses smash when thrown
2017-11-20 02:45:22 -06:00
4b297f509e
512 forward compatibility merge
2017-10-29 10:28:36 -05:00
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
SandPoot