Commit Graph

15793 Commits

Author SHA1 Message Date
Atlantiscze
25ddc19df4 Fractal Energy Reactor can now be mapped in.
Will be used as replacement for Telecomms magical SMES which is buggy. This thingy should work just fine.
2014-11-28 21:35:02 +01:00
Amunak
9eccf15d00 Ghosts can now follow other ghosts
and playing admins can JMP to ghosts. Also did some minor refactoring of the dead saycode.
2014-11-26 22:52:26 +01:00
Chinsky
a570d2c446 Merge pull request #7146 from PsiOmegaDelta/dev
Dev
2014-11-27 00:12:53 +03:00
PsiOmega
23bb747364 Merge remote-tracking branch 'upstream/master' into dev 2014-11-26 22:10:09 +01:00
PsiOmegaDelta
fae43793a4 Merge pull request #7142 from PsiOmegaDelta/Singularity
Syndicate beacon power consumption and objective.
2014-11-26 22:08:48 +01:00
Chinsky
5cc4d3490c Merge pull request #7141 from Amunak/chat-shenanigans
OOC and LOOC colors now use stylesheet; also LOOC rewrite
2014-11-27 00:03:06 +03:00
Chinsky
ee815b719e Merge pull request #7129 from PsiOmegaDelta/Wires
Wires
2014-11-27 00:02:39 +03:00
Chinsky
34d8298c53 Merge pull request #7143 from Amunak/paper-fix
The stars() proc doesn't break formatting, improved papers
2014-11-26 23:58:03 +03:00
Chinsky
06ea5e11fd Merge pull request #7112 from PsiOmegaDelta/LightningRealLightning
Fixes light going through walls.
2014-11-26 23:57:55 +03:00
Chinsky
879b70f709 Merge pull request #7110 from PsiOmegaDelta/Disposals
AI disposal interaction.
2014-11-26 23:57:49 +03:00
Amunak
245a4f142d Whitespace changed by saving in DreamMaker 2014-11-26 16:24:51 +01:00
Amunak
a104c199a7 Renaming paper to its original value will now revert it to initial, not just 'paper' 2014-11-26 16:24:10 +01:00
Amunak
bfe738cf8d Ghosts can view paper from anywhere, improved the 'far' message 2014-11-26 16:21:38 +01:00
Amunak
319e3abd27 Papers will now have a nice description like every other item 2014-11-26 16:20:32 +01:00
Amunak
0ccf63bc2a The stars() helper proc no longer breaks HTML tags 2014-11-26 16:09:48 +01:00
PsiOmegaDelta
eb679ea713 Merge pull request #7134 from Segrain/dev
Bugfix.
2014-11-26 14:10:03 +01:00
PsiOmegaDelta
d2a5689d61 Merge pull request #7131 from GinjaNinja32/nullspace
Fixes most nullspace items, rewrites floor tiles not to del() so much
2014-11-26 14:09:36 +01:00
PsiOmega
d6c0ebf138 Syndicate beacon power consumption and objective.
Cleans up syndicate beacon power consumption.
Objectives are now only given if not disabled.
Relative-proc cleanup.
2014-11-26 09:56:15 +01:00
Amunak
24798bdc9f Updated my comment to make more sense 2014-11-26 04:26:56 +01:00
Amunak
caf153ca61 Rewrite of LOOC code
LOOC now uses stylesheet.
It is less messy (there is now only one loop)
Added shortcut for admins to jump to mob
2014-11-26 04:17:19 +01:00
Amunak
5a65c85cb0 Moved OOC color definitions to stylesheet:
Removes the unused (and abused) set-player-OOC-colour verb.
Adds definitions for each rank to the stylesheet, moving it from the OOC file.
Updates the OOC-text-color verb accordingly.
Made the custom OOC text color resetable.
Cleaned up hardcoded values, old code and comments.
2014-11-26 04:04:32 +01:00
Amunak
c190a5da65 cleaned up unused stylesheet definitions, reordered logically 2014-11-26 03:56:41 +01:00
mwerezak
3246a57875 Fixes #7095 2014-11-25 18:18:39 -05:00
GinjaNinja32
a9111cc8e1 Fixes and guards against strange values 2014-11-25 20:01:30 +00:00
GinjaNinja32
c567bd93e9 Add defines, change comment 2014-11-25 19:44:36 +00:00
PsiOmega
31fc696026 Merge remote-tracking branch 'upstream/dev' into Wires
Conflicts:
	code/game/machinery/autolathe.dm
2014-11-25 11:19:39 +01:00
PsiOmegaDelta
af579e0e25 Merge pull request #7132 from GinjaNinja32/987e7
Fix ultra-rich people crashing the server, cashstack fixes
2014-11-25 10:43:44 +01:00
PsiOmegaDelta
a90dc80bb8 Merge pull request #7127 from Zuhayr/lathe
Generalizing lathe recipes.
2014-11-25 10:43:03 +01:00
PsiOmegaDelta
8af4c93694 Merge pull request #7124 from mwerezak/whisper
Updates whispering messages
2014-11-25 10:42:31 +01:00
PsiOmega
7386a881d7 Merge remote-tracking branch 'upstream/master' into dev 2014-11-25 10:33:47 +01:00
Segrain
6e3afeac5f Bugfix. 2014-11-25 10:29:39 +03:00
PsiOmegaDelta
d98bf2f84d Merge pull request #7121 from GinjaNinja32/monkey
Fix for runtiming neaera cubes
2014-11-25 06:44:11 +01:00
PsiOmegaDelta
1c10dc6a05 Merge pull request #7120 from mwerezak/init
Cleans up monkey initialization
2014-11-25 06:37:26 +01:00
GinjaNinja32
a543d557b9 Fix sub-1 thaler piles being invisible, disallow subdivision below 0.01 2014-11-24 18:56:41 +00:00
GinjaNinja32
20779aac33 Fix ultra-rich people crashing the server 2014-11-24 18:11:09 +00:00
PsiOmegaDelta
75993f2ef5 Merge pull request #7123 from DJSnapshot/adminfeatures
fixes adminhelp to support mods as well
2014-11-24 18:33:16 +01:00
GinjaNinja32
f8ea85b30e Typo fix 2014-11-24 17:29:48 +00:00
GinjaNinja32
48343a23fb Fix most nullspace items, rewrite floor tiles not to del() on every place/remove 2014-11-24 17:05:46 +00:00
PsiOmega
c3a80e4ace Radio wires - Take 2. Can now also cut wiring. 2014-11-24 15:23:06 +01:00
PsiOmega
e98649fa5e Plastique wiring. 2014-11-24 11:21:31 +01:00
PsiOmega
1e479536db Radio wires. 2014-11-24 10:19:57 +01:00
PsiOmega
bf24d288ea Particle acceleration wiring. 2014-11-24 10:12:57 +01:00
PsiOmega
2d832b19cd Mulebot wiring. 2014-11-24 09:50:19 +01:00
PsiOmega
2bfce70376 Autolathe wiring. 2014-11-24 09:17:22 +01:00
Zuhayr
2b93a89d51 Generalizing lathe recipes. 2014-11-24 17:31:15 +10:30
mwerezak
7174cca74a Updates whispering messages
Certain languages can specify a certain verb for whispering and the
message seen when someone whispers outside of hearing range now hints at
the language.
2014-11-23 19:46:10 -05:00
DJSnapshot
b6463cf772 fixes adminhelp to support mods as well. 2014-11-23 16:17:26 -08:00
Zuhayr
a63ec86871 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-11-24 08:58:30 +10:30
GinjaNinja32
fbce3cba4b Fix neaera cubes, change monkeycube eat varfind method to not create nullspace monkeys 2014-11-23 18:57:42 +00:00
mwerezak
feaa27fff1 Cleans up monkey initialization 2014-11-23 13:44:59 -05:00