silicons
|
d0bb22da5f
|
Merge pull request #14653 from timothyteakettle/rp-markings-attempt-two
ports rp's marking system
|
2021-05-19 08:02:59 -06:00 |
|
shellspeed1
|
e4e5d8f5cd
|
adds an pod for projects
|
2021-05-17 00:59:10 -07:00 |
|
Timothy Teakettle
|
3c7137f951
|
what if we didnt break 90% of the game
|
2021-05-05 18:19:02 +01:00 |
|
silicons
|
af7bb2e09f
|
Merge pull request #14585 from zeroisthebiggay/cumbblegum
pov: you're watching zero ruin megafauna by making them DDR raves one pr at a time (ports epic tg bubblegum)
|
2021-04-18 19:00:14 -06:00 |
|
silicons
|
bda9f2ac76
|
Merge pull request #14540 from SandPoot/fixing-lizzies
Fixes some lizards
|
2021-04-08 03:22:46 -06:00 |
|
zerothebigboy
|
657d1f69c8
|
sex
|
2021-04-07 04:18:04 -04:00 |
|
SandPoot
|
2aa2a8c802
|
actually not that much needed
|
2021-03-31 20:28:50 -03:00 |
|
LetterN
|
f976a89157
|
Merge remote-tracking branch 'origin/master' into perlin-genny
|
2021-03-31 08:19:31 +08:00 |
|
SandPoot
|
df4779dced
|
upload files
|
2021-03-29 22:26:34 -03:00 |
|
R3dtail
|
0b3773163c
|
Removes Ichor Crates from chest rolls
Does what it says on the tin
|
2021-03-24 22:20:09 -05:00 |
|
LetterN
|
e3fb2d5491
|
Merge remote-tracking branch 'origin/master' into perlin-genny
|
2021-03-24 21:55:47 +08:00 |
|
silicons
|
720f525683
|
Merge pull request #14323 from dzahlus/hierophant-esword-no-more
Hierophant staff no longer deals 30 damage
|
2021-03-20 14:32:14 -06:00 |
|
LetterN
|
292f67e098
|
Merge remote-tracking branch 'origin/master' into perlin-genny
|
2021-03-20 20:36:56 +08:00 |
|
silicons
|
df92faadd4
|
Update necropolis_chests.dm
|
2021-03-15 19:05:25 -07:00 |
|
Letter N
|
935e46b492
|
The Mapping Update
Cleans up the map (again)
Makes mining code more better
|
2021-03-12 12:11:35 +08:00 |
|
Sneakyrat6
|
d5b0251cb5
|
Merge branch 'master' into matContainer
|
2021-03-09 05:42:47 -05:00 |
|
Sneakyrat6
|
703567e591
|
other fixes
|
2021-03-07 04:09:36 -05:00 |
|
dzahlus
|
71cbd8a615
|
no more free esword
|
2021-02-26 14:40:00 +01:00 |
|
Letter N
|
5304029dd9
|
Merge remote-tracking branch 'origin/master' into hardsync-1.5
|
2021-02-23 11:01:42 +08:00 |
|
SandPoot
|
123de14009
|
upload files
|
2021-02-18 15:05:39 -03:00 |
|
SandPoot
|
f738023097
|
Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing"
This reverts commit 2e29f30fdf, reversing
changes made to 724910cfab.
|
2021-02-18 15:04:46 -03:00 |
|
SandPoot
|
cf2e70671a
|
upload files
|
2021-02-18 14:47:10 -03:00 |
|
Letter N
|
de67720a0a
|
icons should exist
|
2021-02-14 11:39:56 +08:00 |
|
Letter N
|
5db87b9065
|
more updates!
|
2021-02-12 17:52:59 +08:00 |
|
Letter N
|
6286d40082
|
code works
|
2021-02-12 17:26:08 +08:00 |
|
keronshb
|
68b65c3f93
|
Fixes some error, re adds knockdown
should prevent item drops
|
2021-01-30 16:19:09 -05:00 |
|
keronshb
|
8a75d59db2
|
Meathook tweaks
Changes some values to make it a bit more fair.
|
2021-01-30 15:59:59 -05:00 |
|
Timothy Teakettle
|
6d6b232afe
|
i hate shitcoders
|
2021-01-27 20:33:14 +00:00 |
|
kappa-sama
|
c751f114aa
|
finally
|
2021-01-12 01:42:55 -05:00 |
|
silicons
|
697619856c
|
Merge pull request #13859 from timothyteakettle/unlockable-loadout-items
unlockable loadout items
|
2021-01-03 18:07:18 -07:00 |
|
Timothy Teakettle
|
813e0f4c79
|
Merge remote-tracking branch 'upstream/master' into unlockable-loadout-items
|
2021-01-01 22:30:04 +00:00 |
|
SandPoot
|
a0e95b7c3d
|
Update code/modules/mining/ores_coins.dm
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
|
2020-12-31 16:59:33 -03:00 |
|
SandPoot
|
1fa828a3f7
|
upload files
|
2020-12-30 13:57:10 -03:00 |
|
Timothy Teakettle
|
c3e9cdd9a5
|
finale
|
2020-12-26 23:09:19 +00:00 |
|
Artur
|
d72617e7d7
|
Fixes mint machine
|
2020-12-22 12:35:21 +02:00 |
|
The0bserver
|
4559a153c3
|
Map Tweak
|
2020-11-27 16:51:55 -05:00 |
|
The0bserver
|
884fbd0a52
|
found you.
|
2020-11-27 03:45:08 -05:00 |
|
silicons
|
75d807df4e
|
Merge pull request #13694 from TheObserver-sys/PublicMiningRevival
Local Assistant man can now bash rock again!*
|
2020-11-21 18:25:13 -07:00 |
|
The0bserver
|
6d1ace27f7
|
Initial Commit: Mapping is painful
|
2020-11-18 00:38:35 -05:00 |
|
silicons
|
803bff4e5f
|
funny
|
2020-11-12 23:34:42 -07:00 |
|
DeltaFire15
|
91584053f5
|
Fixes a bunch of fallout from the tgui PR (#13648)
* screamies
fixes a bunch of fallout from the tgui PR.. probably
* Empty commit to poke travis
|
2020-11-01 21:59:22 +01:00 |
|
silicons
|
1baa3013b3
|
Merge pull request #13626 from zeroisthebiggay/GOD
[SALT] MAKES MEGAFAUNA ITEMS LAVAPROOF (LIKE THE LAVA STAFF)
|
2020-10-28 07:53:44 -07:00 |
|
Ghommie
|
90c4cb2022
|
Here I fix a few issues.
|
2020-10-25 14:50:42 +01:00 |
|
zeroisthebiggay
|
2c278ba370
|
A
A
|
2020-10-25 05:34:53 -04:00 |
|
zeroisthebiggay
|
5eec2b76f5
|
OK MAYBE NOT INDESTRUCTIBLE
OK
|
2020-10-25 05:34:24 -04:00 |
|
zerothebigboy
|
6577aaac91
|
FRUSTRATION
|
2020-10-25 05:30:06 -04:00 |
|
Hatterhat
|
4195f96876
|
glaive daggers squashed
|
2020-10-03 14:32:19 -05:00 |
|
silicons
|
8b36cf6f64
|
Merge pull request #13375 from timothyteakettle/emp-rework
the emp rework (emp severity reduces as you move from epicentre, severity is 1-100)
|
2020-10-01 03:01:18 -07:00 |
|
Timothy Teakettle
|
106b8ccead
|
Merge branch 'master' into heterochromia
|
2020-09-24 22:09:03 +01:00 |
|
Artur
|
435565f1d8
|
Merge remote-tracking branch 'origin/master' into TGUI_Updoot
|
2020-09-21 00:16:12 +03:00 |
|