Commit Graph

2280 Commits

Author SHA1 Message Date
Zulker Nayeen Nahiyan
0a3f523066 Merge remote-tracking branch 'refs/remotes/origin/dev' into dev
Conflicts:
	code/__HELPERS/maths.dm
	code/__HELPERS/type2type.dm
	code/modules/clothing/head/hardhat.dm
	code/modules/clothing/spacesuits/captain.dm
	code/modules/clothing/spacesuits/miscellaneous.dm
	code/modules/clothing/spacesuits/rig/rig_pieces.dm
	code/modules/clothing/spacesuits/rig/suits/light.dm
	code/modules/clothing/spacesuits/spacesuits.dm
	code/modules/clothing/suits/armor.dm
	code/modules/clothing/suits/utility.dm
	code/modules/events/event_manager.dm
	code/modules/mob/living/living.dm
	code/setup.dm
2015-02-04 04:44:09 +06:00
Chinsky
84472462ab Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into firefirEFIREBURNAHAHAHA
Conflicts:
	code/modules/mob/living/living_defines.dm
2015-02-03 18:30:18 +03:00
Chinsky
95ff9570ee Merge pull request #7930 from RKF45/newpaint
Generic paint
2015-02-03 18:15:42 +03:00
Chinsky
aa7fde250c Merge pull request #7801 from Mloc/bs12-glowypipes
refactor buckling + glowy HE pipes
2015-02-03 18:12:09 +03:00
Chinsky
1c3b1087dd Merge pull request #7582 from Zuhayr/richard
Do you like hurting other people?
2015-02-03 18:10:34 +03:00
PsiOmega
1732d0c79a Merge remote-tracking branch 'upstream/master' into TheGreatPurge
Conflicts:
	code/WorkInProgress/computer3/computers/message.dm
	code/WorkInProgress/kilakk/responseteam.dm
2015-02-03 14:16:14 +01:00
Chinsky
95eacd2185 Merge pull request #8008 from volas/sanitize_procs
Fixes for some sanitize moments
2015-02-03 15:08:47 +03:00
Chinsky
72463a35f3 Another pass at WIP folder 2015-02-03 12:14:13 +03:00
Chinsky
2a1f0849d8 Cleaned out my WIP folder. 2015-02-03 08:27:18 +03:00
D Anzorge
abeb634d01 Make borg radio window tell if loudspeaker is on 2015-02-02 16:27:14 -05:00
D Anzorge
609f9848bc Fix borg radio weirdness
Borg radio interface toggling was backwards: when usr got the message that the subspace mode was
disabled, the radio would actually enter subspace mode.
2015-02-02 16:27:14 -05:00
RKF45
6577cd2a55 Merge remote-tracking branch 'upstream/dev' into newpaint
Conflicts:
	code/game/objects/items/weapons/paint.dm
2015-02-01 23:04:18 +01:00
RKF45
4d8dd50cea Mixing of paint
The generic paint can now be mixed and tranferred.
2015-02-01 22:54:18 +01:00
volas
8abd7d0735 correction of all copytext(sanitize(..)) to sanitize(copytext(..)) 2015-02-01 22:54:56 +03:00
RKF45
4eb3e16f72 Reviewing paint recipes
All recipes make "paint" and have different colours via var/resultcolor
White paint can also be made non-ghettoly.
2015-02-01 01:34:39 +01:00
Chinsky
b995c856a9 Merge pull request #7924 from Kelenius/ofTablesAndPass
Removes FPRINT and TABLEPASS flags
2015-01-30 16:17:41 +03:00
Zuhayr
b280cb6d42 Fixes #7919 2015-01-29 11:27:56 +10:30
Loganbacca
34d44f8732 Tape fixes
- Fixed taping paper bundles
- Reduced issues with sticking papers around corners
- Removed a couple of colons from paper_bundle.dm
2015-01-26 15:16:27 +13:00
RKF45
c5afd47bc6 Eating crayons 2015-01-25 17:11:06 +01:00
ccomp5950
44a9a722d0 Removed unused code that was intended for a different implenetation. 2015-01-25 07:21:14 -05:00
ccomp5950
89652ae5e3 JSON caching for nanoui
You get to cache data, make the best of it.

NanoUI for PDA now won't shove the manifest through list2json every tick, it will cache the json for manifest and shove it into the cache_data so list2json tacks it onto the end.
2015-01-25 06:22:30 -05:00
Kelenius
10de826ca3 Removes FPRINT and TABLEPASS flags 2015-01-23 22:27:32 +03:00
Zuhayr
c61537f265 Adjusting twohanded values as discussed in diff. 2015-01-20 19:15:10 +10:30
Zuhayr
5e7133dd08 Converted baseball bats to twohanded weapons. 2015-01-20 19:14:38 +10:30
Zuhayr
aa5013fa08 Merge pull request #7885 from Baystation12/master
Updating dev-freeze from master.
2015-01-20 18:49:03 +10:30
Zulker Nayeen Nahiyan
490027405a Merge remote-tracking branch 'origin/dev' into dev
Conflicts:
	code/modules/virus2/helpers.dm
2015-01-19 02:15:38 +06:00
Chinsky
d42482c7cc Fixes #7259
Removes forks used for ribcage opening/closing since it overlapped with internal organ surgery and for some reason even priorities didn't help with that.
2015-01-16 14:18:51 +03:00
Chinsky
95e4f53258 Ported TG's code for burny mobs, by ergoslavi. 2015-01-15 23:47:07 +03:00
Loganbacca
985d410657 Air tank interface fix
- Allows tanks to be toggled on and off as internals from their UI.
- If internals are off, all tanks capable of being used for internals
will display "tank is connected to a mask".
- If internals are on, only the tank that is actively supplying air is
listed as "connected" and "open". All others will display as "not
connected".
- Tanks inside rigs will correctly display their status in their UI (if
you open it before putting it in the rig, but cannot be toggled on
through the interface. Toggling them on with the internals button works.
2015-01-13 23:19:58 +13:00
Mloc-Argent
537b78fc80 refactor buckling to be more generic
Buckling procs and vars have been moved down to /obj.
Behaviour is mostly the same, but you can buckle cuffed people to
 pipes and they will automatically unbuckle if the cuffs are removed.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2015-01-12 21:28:31 +00:00
Zuhayr
61d35bd474 Merge resolution. 2015-01-12 07:17:02 +10:30
ccomp5950
2816d3c02b Fixes PDA locking up after receiving a " in conversation.
Long story short, the json encoding doesn't know how to handle &#34;
Adding a check specifically for it breaks other stuff, after banging my head against it for an hour
this is the best means of fixing the problem without breaking and fixing a lot of other things.
2015-01-09 22:27:15 -05:00
Zulker Nayeen Nahiyan
935448c098 Merge branch origin/dev into dev 2015-01-10 02:25:26 +06:00
Zulker Nayeen Nahiyan
6e550d7308 Cleanup helper files maths.dm, time.dm, type2type.dm, add macros for bit-manipulation
`maths.dm`:
	Rewrite `Gcd(x)` to remove recursive behaviour.
	Remove `RaiseToPower(x)` and its usage from `event_manager.dm`.
	Rename `Lerp()` to `Interpolate()`.
	Add `Square(x)`, which squares a number.
	Rearrange most of the functions in the file. (trigonometric functions together, etc.)

`type2type.dm`:
	Rewrite `num2hex()` and optimise `hex2num()` for superior clarity and a 100% speed improvement.
	Correct indenting, spaces, make switches more concise.

`time.dm`:
	Remove old, slanderous commented-out function `/proc/time_stamp()`

`lists.dm`:
	Add the macros, `BITTEST(bitfield,index)`, `BITSET(...)`, `BITRESET(...)`
	  and `BITFLIP(...)` for bit-manipulation and use them where 20+ files
	  do it manually, for arguments of reader clarity and standardness.
2015-01-09 21:55:11 +06:00
Tramziller
11ff174636 Old link was replaced by new one 2015-01-08 22:26:31 +01:00
Zuhayr
b36b41a2f5 Fixes #7656 2015-01-09 03:58:43 +10:30
Zuhayr
0d071e7f9d Fixes #7683 2015-01-09 03:48:46 +10:30
Zuhayr
9fa73784a5 Fixes #7660 2015-01-05 01:05:13 +10:30
Zuhayr
a255fe48ca Fixes #7619 2015-01-02 19:28:30 +10:30
Atlantiscze
2580db82b5 Removes debug statement
- Forgot to add this into my previous commit.
2015-01-01 07:54:04 +01:00
Atlantiscze
a17656086c Fixes #7349
- This fixes missing powernet sensor entries in engineer PDAs.
- This is done by reimplementing old system, that instead connected to consoles. Bleh.
- New system connects directly to sensors, but offers only very limited amount of information (ie. console is 5x better and nicer, this is intentional before someone begins yelling it's a bug!)
2015-01-01 07:52:44 +01:00
Zuhayr
cdfa2a5205 Merge pull request #7586 from Zuhayr/dev-freeze
Fixes the remainder of #7567, plus other fixes.
2014-12-31 22:48:39 +10:30
Chinsky
fe403d013b Merge pull request #7583 from atlantiscze/cellrate-hardsuit-stuff
Hardsuit Powersink Adjustments
2014-12-31 08:17:20 +03:00
Zuhayr
a5b937c1e8 Readded null check. 2014-12-31 14:12:10 +10:30
Ccomp5950
e0047c5830 Merge pull request #7545 from atlantiscze/blast-door-refactor
Blast Door refactor
2014-12-30 21:15:47 -05:00
Zuhayr
a76af3c7c5 Fixes #7572 2014-12-30 16:33:34 +10:30
Atlantiscze
a9e1f920fd Powersink Load Fix
- Apparently i forgot to add check for used amount of power when reworking powersink, causing it to drain 2kW from each APC, even above drain cap.
2014-12-29 20:36:50 +01:00
Atlantiscze
301af06033 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into blast-door-refactor 2014-12-28 23:50:15 +01:00
Zuhayr
505d84049c Properly implements the species insulated var (renames it to siemens_coefficient), includes it in electrocution, rebalances species values accordingly. 2014-12-28 19:16:07 +10:30
Zuhayr
fabee2fdf8 Stopped glass shards from proning mobs with NO_PAIN. 2014-12-28 17:32:55 +10:30