 Fox-McCloud
|
d602d128f7
|
Merge remote-tracking branch 'upstream/master' into rcs-update
|
2015-09-23 01:19:28 -04:00 |
|
|
Mark van Alphen
|
70359bbb21
|
Merge pull request #2127 from Fox-McCloud/botany-cargo
Botany Cargo Points
|
2015-09-23 07:09:47 +02:00 |
|
|
Mark van Alphen
|
f62970c553
|
Merge pull request #2135 from Fox-McCloud/dismemberment-fix
Explosion Dismemberment Fix
|
2015-09-23 07:09:38 +02:00 |
|
|
Markolie
|
9adff714b9
|
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into sql
Conflicts:
code/controllers/configuration.dm
config/example/config.txt
|
2015-09-23 07:07:17 +02:00 |
|
|
Markolie
|
73bacbf17f
|
Preference option for instruments/sanitize tempo
|
2015-09-23 07:00:01 +02:00 |
|
|
Fox-McCloud
|
cf5bfcaac1
|
Telegun Refactor
|
2015-09-23 00:44:50 -04:00 |
|
|
Markolie
|
7ab75a3b9a
|
Missed prefix
|
2015-09-23 06:25:52 +02:00 |
|
|
Markolie
|
bbaa60c8ce
|
Fixes
|
2015-09-23 06:22:00 +02:00 |
|
|
Markolie
|
bec9fca533
|
SQL update
|
2015-09-23 06:13:42 +02:00 |
|
|
Markolie
|
d10b68363f
|
IPC posibrain name fix
|
2015-09-23 05:15:26 +02:00 |
|
|
Markolie
|
2b7fda8a47
|
SQL based memos
|
2015-09-23 05:08:28 +02:00 |
|
|
Mark van Alphen
|
a9320fa701
|
Merge pull request #2140 from tigercat2000/whops
Fix COMIC-stuttering conflict
|
2015-09-23 04:43:29 +02:00 |
|
|
Tigercat2000
|
21e4750ade
|
Fix COMIC-stuttering conflict
|
2015-09-22 19:37:57 -07:00 |
|
|
Markolie
|
4b2dcf2394
|
Nuke the privacy poll
|
2015-09-23 04:31:28 +02:00 |
|
|
Crazylemon64
|
dd6b153824
|
Fixed the beyond repair message's formatting
|
2015-09-22 19:11:07 -07:00 |
|
|
Crazylemon64
|
c1db00b533
|
Corrected the indentation of the typecast
Not my finest moment...
|
2015-09-22 18:57:55 -07:00 |
|
|
Crazylemon64
|
d9e6382ef9
|
Lined up the else statement
|
2015-09-22 18:56:07 -07:00 |
|
|
Crazylemon64
|
2b4d1d0b5c
|
Removed the spaces
Yeah, vim is probably not my best tool of choice here...
|
2015-09-22 18:50:49 -07:00 |
|
|
Crazylemon
|
9c64e2f521
|
Put the N in the N.use(1)
|
2015-09-22 18:45:12 -07:00 |
|
|
Crazylemon
|
da10b5a795
|
Syntax errors removed
|
2015-09-22 18:42:44 -07:00 |
|
|
Fox-McCloud
|
dea1d5a78d
|
Merge pull request #2136 from Markolie/pet
Fixes
|
2015-09-22 21:19:11 -04:00 |
|
|
Markolie
|
039a79ff26
|
Research consoles auto sync fix
|
2015-09-23 02:52:07 +02:00 |
|
|
Markolie
|
551d4e8988
|
Admin jump window fix
|
2015-09-23 02:51:59 +02:00 |
|
|
Crazylemon
|
5e871f159d
|
Allows repair of pAIs with nanopaste
|
2015-09-22 17:49:25 -07:00 |
|
|
Fox-McCloud
|
5191d449fd
|
Explosion Dismemberment Fix
|
2015-09-22 20:17:53 -04:00 |
|
|
TheDZD
|
67d84e0bbf
|
Merge pull request #2118 from Markolie/pet
Fixes, saber SMG update
|
2015-09-22 19:06:37 -04:00 |
|
|
TheDZD
|
cbbd31d445
|
Merge pull request #2128 from Fox-McCloud/rejuv-fixup
Rejuvinate Fixup
|
2015-09-22 19:05:51 -04:00 |
|
|
Fox-McCloud
|
d1ce77b30f
|
cut the list
|
2015-09-22 12:17:11 -04:00 |
|
|
Mark van Alphen
|
fea9ce1e78
|
Merge pull request #2116 from Fox-McCloud/borg-virus
Borg Transformation Virus Symptom
|
2015-09-22 16:52:18 +02:00 |
|
|
Mark van Alphen
|
ca05c41134
|
Merge pull request #2117 from Fox-McCloud/surgery-cleanup
Cleans Up Surgery Files
|
2015-09-22 16:51:11 +02:00 |
|
|
Mark van Alphen
|
6d46c06297
|
Merge pull request #2113 from tigercat2000/whisper_autohiss
Whisper Refactor
|
2015-09-22 16:48:42 +02:00 |
|
|
Fox-McCloud
|
71001cc5ea
|
Changes a Chemistry Transfer Proc
|
2015-09-22 05:56:49 -04:00 |
|
|
Fox-McCloud
|
784dd66e46
|
Rejuvinate Fixup
|
2015-09-22 02:42:39 -04:00 |
|
|
Fox-McCloud
|
c692c0d8ce
|
spacing consistnecy, re-adds peanuts
|
2015-09-22 01:35:21 -04:00 |
|
|
Tigercat2000
|
a51fcb20c2
|
Fix posibrains being unable to speak binary
|
2015-09-21 22:19:27 -07:00 |
|
|
Fox-McCloud
|
1bd5283da5
|
Botany Cargo Points
|
2015-09-22 01:19:02 -04:00 |
|
|
Fox-McCloud
|
562305902e
|
fix for symptom
|
2015-09-21 21:10:20 -04:00 |
|
|
Markolie
|
727e1271b0
|
Missing variable
|
2015-09-22 01:51:28 +02:00 |
|
|
Markolie
|
dc70ec8e8b
|
Accounts database fix
|
2015-09-22 01:38:41 +02:00 |
|
|
Markolie
|
3c7413dc65
|
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into pet
Conflicts:
_maps/map_files/cyberiad/cyberiad.dmm
|
2015-09-22 00:17:30 +02:00 |
|
|
Tigercat2000
|
c43db838f2
|
fix me() verb
|
2015-09-21 15:15:05 -07:00 |
|
|
Markolie
|
3caac1e1e2
|
Check for 100+ armor
|
2015-09-21 22:58:42 +02:00 |
|
|
Markolie
|
f7234374b5
|
Update armour penetration checks
|
2015-09-21 22:54:26 +02:00 |
|
|
Markolie
|
ea305d3ffa
|
Saber SMG update, add armour piercing variable
|
2015-09-21 22:50:07 +02:00 |
|
|
Markolie
|
cc641cb477
|
Photo image fix
|
2015-09-21 22:49:49 +02:00 |
|
|
Fox-McCloud
|
128ad8225b
|
Clans Up Surgery Files
|
2015-09-21 07:17:23 -04:00 |
|
|
Fox-McCloud
|
206ddda717
|
Borg Transformation Virus Symptom
|
2015-09-21 04:25:26 -04:00 |
|
|
Fox-McCloud
|
810784c8ac
|
qdel() dem powernets
|
2015-09-21 01:17:12 -04:00 |
|
|
Fox-McCloud
|
36ec45253e
|
Merge remote-tracking branch 'upstream/master' into rcs-update
|
2015-09-21 00:30:00 -04:00 |
|
|
Fox-McCloud
|
4e9befc310
|
Tweaks
|
2015-09-21 00:25:27 -04:00 |
|