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
Atlantiscze
8594697552
SMES Failure logging + small fix
...
- SMES failures are now logged, including position of SMES, user and intensity of failure (from 1 to 100). Also included is JMP button.
- Instead of using ugly long string nice proc ping is used.
- Fixes issue with SMES overloads almost never causing APC failures.
2014-11-25 18:09:49 +01:00
Atlantiscze
3ae77af341
Fixes some SMESs on station which had wrong type
...
- Atmospherics, north solar and outpost SMESs remapped to be of /smes/buildable type instead of /smes/ which can't be upgraded and/or disassembled.
- Added warning which shows in the log when non-magical or non-buildable SMES is mapped in/spawned. This should *hopefully* remind mappers that regular SMESs are not suposed to be mapped in unless specifically needed.
2014-11-25 17:10:20 +01: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
Zuhayr
4722c9a864
WIP on refactoring the context-based combat PR
2014-11-24 12:05:18 +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
PsiOmegaDelta
7dd5da6793
Merge pull request #6896 from Hubblenaut/dev
...
Context-based Combat Part 1
2014-11-23 19:13:52 +01:00
PsiOmegaDelta
0ef913292f
Merge pull request #7106 from Zuhayr/xenoflora
...
Randomizes strange seed icons, fixes poppies.
2014-11-23 18:10:00 +01:00
PsiOmegaDelta
c8e00f3e20
Merge pull request #7089 from sabiram/dev
...
Moves my (sabirm)'s custom item to common loadout pool
2014-11-23 18:08:16 +01:00
PsiOmega
dc5ab9bb64
Merge remote-tracking branch 'upstream/master' into dev
2014-11-23 12:07:45 +01:00
PsiOmegaDelta
8878b3e107
Merge pull request #7109 from Ccomp5950/mop_fix
...
Solves a runtime when someone tries to mop up blood.
2014-11-23 12:06:09 +01:00
PsiOmegaDelta
8e50a32ba8
Merge pull request #7103 from Segrain/dev
...
Robotic appearances.
2014-11-23 12:05:51 +01:00
PsiOmegaDelta
46a1a7c320
Merge pull request #7101 from MagmaRam/sprites
...
Adds inhand sprites for the captain's tunic and jacket
2014-11-23 12:05:45 +01:00
Zuhayr
f722d570fa
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
2014-11-23 12:52:55 +10:30
Zuhayr
66c6c0f270
Amendment to the previous.
2014-11-23 10:15:31 +10:30
Zuhayr
5568ed15c1
Randomizes strange seed icons, fixes poppies.
2014-11-23 10:15:15 +10:30
PsiOmegaDelta
6db8680406
Merge pull request #7097 from GinjaNinja32/sensors
...
Crew Monitoring Computer improvements, wallets working with computers
2014-11-22 22:36:40 +01:00
PsiOmega
596a7160b8
Fixes light going through walls.
...
See https://github.com/tgstation/-tg-station/pull/5972 and https://github.com/tgstation/-tg-station/issues/2788 .
2014-11-22 12:00:21 +01:00
PsiOmega
de5c059a01
AI disposal interaction.
...
The AI can now interact with disposal units and turn the pump on/off.
2014-11-22 11:46:51 +01:00
Ccomp5950
674a76645f
Merge pull request #7082 from PsiOmegaDelta/Science!
...
Further Research Isolation Cell Changes
2014-11-22 05:39:52 -05:00
