676cb864b1
missed proc refs
2024-03-12 22:17:30 -03:00
a65f323734
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into proc-define-shit
2024-03-08 19:10:22 -03:00
c7a2565255
stop this nonsense
2024-01-05 00:28:56 -03:00
a558377206
more stuff i can't guarantee works by itself yet
2023-11-29 23:37:15 -03:00
586a035132
Update files
2022-04-06 18:41:31 -03:00
ccfde52b0d
code
2021-09-02 23:45:03 -04:00
251bd3e06b
logging
2020-12-31 12:33:05 -08:00
c310b1a70e
Merge pull request #12997 from silicons/lavastaff
...
fixes medsprays, sutures/regenmesh, and lavastaves not respecting clickdelay (rip instant chemdump heal on self)
2020-08-05 19:43:38 -05:00
20dea7e41f
fix
2020-08-01 20:45:49 -07:00
9721025582
Merge branch 'master' into wounds-part-2
2020-07-29 15:47:44 +01:00
78312c23bf
sigh
2020-07-28 21:53:07 -07:00
8360bb1a7f
section 2
2020-07-24 23:44:57 +01:00
98d3ac80d9
:pika:
2020-07-20 11:25:17 -07:00
8cb15f9279
Actually Balanced and Standardized Vendor Prices. ( #12495 )
2020-06-09 22:22:53 -07:00
b2a20d5438
reducing some prices as training wheel.
2020-05-03 05:37:04 +02:00
94f014589d
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685
2020-04-25 17:09:34 +02:00
42201343a9
Backward 512 compatibility removal.
2020-04-23 00:59:23 +02:00
4c6f1b622b
Porting Goofconomy & co.
2020-04-17 07:48:11 +02:00
59b1a223a3
Ok, done.
2020-03-08 22:51:36 +01:00
95db5084ab
Screw commit history.
2020-02-02 01:26:04 +01:00
16a37e2769
Standardises all files from CRLF to LF
2020-01-12 14:28:01 +00:00
b4c0433d6d
more work.
2019-12-27 17:45:19 +01:00
53d142b4c0
more work.
2019-12-25 01:34:33 +01:00
00adead300
Fixes syringes too.
2019-10-15 21:43:04 +01:00
e115c456f3
Ohh I'm fixing
2019-10-15 13:41:49 +01:00
acc0ff8a17
Adds craftable extended mags
2019-10-15 12:37:35 +01:00
23743c8630
Updates chemmaster
2019-10-15 11:21:05 +01:00
fec1df2098
Rephrasal for understanding.
2019-06-19 00:52:45 +01:00
1cc0724519
Merge branch 'master' into Dwarf
2019-06-17 12:09:55 +01:00
17403bd059
Non-functioning EMP code for review (revert before merging.)
2019-06-13 00:58:54 +01:00
84c3c104cd
Pointed out that a message could be misinterpreted as lewd.
2019-06-08 06:32:12 +01:00
42d0ab4825
Comment cleanup.
2019-06-08 01:31:21 +01:00
c6c98b539d
Minor bug fix.
2019-06-08 01:22:43 +01:00
7aac9e6280
Updates reagents a bit.
2019-06-07 06:27:04 +02:00
fd22dbfc0d
More fixes. Need to check over merging math.
2019-06-02 03:59:52 +01:00
0fa445c153
Fixes and test.
2019-06-02 03:24:01 +01:00
3cf3268c76
New non-harmful medicinal darts.
2019-06-01 22:52:03 +01:00
d8312ec5ae
Medical belt overlays + hypo storage
2019-04-04 18:38:34 -05:00
99e57fb221
various citadel tweaks/fixes
...
remeber to add //citadel edit to base code changes because we're still a downstream and hard syncs are still a thing
2018-09-17 03:26:05 -05:00
284e9d0325
module things, jfc
2018-09-11 07:51:01 -05:00
1b11773cd9
DB port
2018-08-23 07:20:49 -05:00
02a86dd2a0
New Alien Lavaland Ruin ( #7455 )
...
* Removes the old "xeno nest" lavaland ruin that currently is blacklisted on the live server, and replaces it with a new "alien nest" ruin.
* Tiny ruin description change.
* Removed all organs scattered around the nest, and replaced them with corpses you must harvest the organs from. Also slightly changes the loot and the locations of said loot.
Drone and Queen corpse spawners have been added.
* Removed xenomorph queen corpse, moved drone corpse into a location that is harder to cheese. Added "Hive's Blessing" (Syringe containing alien microbes.)
2018-08-23 00:26:32 -07:00
72231976a7
Replaces plasma in execution syringes with amatoxin ( #7360 )
...
* Removes plasma from execution syringes
holy shit what a meme
* Replaces initropidril with amatoxin
shit man idk lmao
2018-08-03 19:30:10 -07: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
e4a96fe2cd
Syringe update_icon sanity
2018-01-26 02:59:21 -06:00
fb86cf6878
Fixes syringe icons ( #34704 )
2018-01-22 12:01:02 -06:00
3973b368de
Merge branch 'master' into upstream-merge-33470
2017-12-21 03:24:03 -06:00
522b8383d8
[READY]Refactors reagent container types
2017-12-18 22:54:51 -06:00
f875d4e176
Defines math, take 2
2017-12-17 10:02:43 -06:00
cc0b768c72
[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES ( #4014 )
...
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES
* resetting all the maps because we can worry about them later.
* Regexing
* I'm fucked
* Fixes
* .
* maps
* bleh
* ree
* fixes
2017-12-11 16:36:38 -08:00
SandPoot