diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index ee9f3715ea7..a903c0b4348 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -221,6 +221,10 @@ proc/issyndicate(mob/living/M as mob) var/obj/item/weapon/paper/P = new P.info = "The nuclear authorization code is: [nuke_code]" P.name = "nuclear bomb code" + var/obj/item/weapon/stamp/syndicate/stamp = new + P.stamp(stamp) + qdel(stamp) + if (ticker.mode.config_tag=="nuclear") P.loc = synd_mind.current.loc else diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index dc66fdd713d..1d9f70890d4 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -1849,10 +1849,12 @@ if("Administrator") stamptype = input(src.owner, "Pick a stamp type.", "Stamp Type") as null|anything in list("icon","text","none") if(stamptype == "icon") - stampname = input(src.owner, "Pick a stamp icon.", "Stamp Icon") as null|anything in list("centcom","granted","denied","clown") + stampname = input(src.owner, "Pick a stamp icon.", "Stamp Icon") as null|anything in list("centcom","syndicate","granted","denied","clown") switch(stampname) if("centcom") stampvalue = "cent" + if("syndicate") + stampvalue = "syndicate" if("granted") stampvalue = "ok" if("denied") diff --git a/code/modules/admin/verbs/striketeam.dm b/code/modules/admin/verbs/striketeam.dm index c4fda49439a..17666214bc8 100644 --- a/code/modules/admin/verbs/striketeam.dm +++ b/code/modules/admin/verbs/striketeam.dm @@ -87,7 +87,10 @@ var/global/sent_strike_team = 0 var/obj/item/weapon/paper/P = new(L.loc) P.info = "

Good morning soldier!. This compact guide will familiarize you with standard operating procedure. There are three basic rules to follow:
#1 Work as a team.
#2 Accomplish your objective at all costs.
#3 Leave no witnesses.
You are fully equipped and stocked for your mission--before departing on the Spec. Ops. Shuttle due South, make sure that all operatives are ready. Actual mission objective will be relayed to you by Central Command through your headsets.
If deemed appropriate, Central Command will also allow members of your team to equip assault power-armor for the mission. You will find the armor storage due West of your position. Once you are ready to leave, utilize the Special Operations shuttle console and toggle the hull doors via the other console.

In the event that the team does not accomplish their assigned objective in a timely manner, or finds no other way to do so, attached below are instructions on how to operate a Nanotrasen Nuclear Device. Your operations LEADER is provided with a nuclear authentication disk and a pin-pointer for this reason. You may easily recognize them by their rank: Lieutenant, Captain, or Major. The nuclear device itself will be present somewhere on your destination.

Hello and thank you for choosing Nanotrasen for your nuclear information needs. Today's crash course will deal with the operation of a Fission Class Nanotrasen made Nuclear Device.
First and foremost, DO NOT TOUCH ANYTHING UNTIL THE BOMB IS IN PLACE. Pressing any button on the compacted bomb will cause it to extend and bolt itself into place. If this is done to unbolt it one must completely log in which at this time may not be possible.
To make the device functional:
#1 Place bomb in designated detonation zone
#2 Extend and anchor bomb (attack with hand).
#3 Insert Nuclear Auth. Disk into slot.
#4 Type numeric code into keypad ([nuke_code]).
Note: If you make a mistake press R to reset the device.
#5 Press the E button to log onto the device.
You now have activated the device. To deactivate the buttons at anytime, for example when you have already prepped the bomb for detonation, remove the authentication disk OR press the R on the keypad. Now the bomb CAN ONLY be detonated using the timer. A manual detonation is not an option.
Note: Toggle off the SAFETY.
Use the - - and + + to set a detonation time between 5 seconds and 10 minutes. Then press the timer toggle button to start the countdown. Now remove the authentication disk so that the buttons deactivate.
Note: THE BOMB IS STILL SET AND WILL DETONATE
Now before you remove the disk if you need to move the bomb you can: Toggle off the anchor, move it, and re-anchor.

The nuclear authorization code is: [nuke_code ? nuke_code : "None provided"]

Good luck, soldier!

" P.name = "Spec. Ops Manual" - P.icon = "pamphlet-ds" + P.icon = "pamphlet-ds" + var/obj/item/weapon/stamp/centcom/stamp = new + P.stamp(stamp) + qdel(stamp) for (var/obj/effect/landmark/L in landmarks_list) if (L.name == "Commando-Bomb") diff --git a/code/modules/client/global_cache.dm b/code/modules/client/global_cache.dm index d6a0dcb87c5..f60d26fe84b 100644 --- a/code/modules/client/global_cache.dm +++ b/code/modules/client/global_cache.dm @@ -78,6 +78,7 @@ "large_stamp-qm.png" = 'icons/paper_icons/large_stamp-qm.png', "large_stamp-law.png" = 'icons/paper_icons/large_stamp-law.png', "large_stamp-cent.png" = 'icons/paper_icons/large_stamp-cent.png', + "large_stamp-syndicate.png" = 'icons/paper_icons/large_stamp-syndicate.png', "talisman.png" = 'icons/paper_icons/talisman.png', "ntlogo.png" = 'icons/paper_icons/ntlogo.png' ) diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 9f1d25d8278..f5373f51ffd 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -430,36 +430,12 @@ if((!in_range(src, usr) && loc != user && !( istype(loc, /obj/item/weapon/clipboard) ) && loc.loc != user && user.get_active_hand() != P)) return - //stamps += (stamps=="" ? "
" : "
") + "This paper has been stamped with the [P.name]." - stamps += (stamps=="" ? "
" : "") + "" - - var/image/stampoverlay = image('icons/obj/bureaucracy.dmi') - var/{x; y;} - if(istype(P, /obj/item/weapon/stamp/captain) || istype(P, /obj/item/weapon/stamp/centcom)) - x = rand(-2, 0) - y = rand(-1, 2) - else - x = rand(-2, 2) - y = rand(-3, 2) - offset_x += x - offset_y += y - stampoverlay.pixel_x = x - stampoverlay.pixel_y = y - if(istype(P, /obj/item/weapon/stamp/clown)) if(!clown) user << "You are totally unable to use the stamp. HONK!" return - if(!ico) - ico = new - ico += "paper_[P.icon_state]" - stampoverlay.icon_state = "paper_[P.icon_state]" - - if(!stamped) - stamped = new - stamped += P.type - overlays += stampoverlay + stamp(P) user << "You stamp the paper with your rubber stamp." @@ -468,6 +444,32 @@ add_fingerprint(user) return + +/obj/item/weapon/paper/proc/stamp(var/obj/item/weapon/stamp/S) + stamps += (!stamps || stamps == "" ? "
" : "") + "" + + var/image/stampoverlay = image('icons/obj/bureaucracy.dmi') + var/{x; y;} + if(istype(S, /obj/item/weapon/stamp/captain) || istype(S, /obj/item/weapon/stamp/centcom)) + x = rand(-2, 0) + y = rand(-1, 2) + else + x = rand(-2, 2) + y = rand(-3, 2) + offset_x += x + offset_y += y + stampoverlay.pixel_x = x + stampoverlay.pixel_y = y + + if(!ico) + ico = new + ico += "paper_[S.icon_state]" + stampoverlay.icon_state = "paper_[S.icon_state]" + + if(!stamped) + stamped = new + stamped += S.type + overlays += stampoverlay /* * Premade paper diff --git a/code/modules/paperwork/stamps.dm b/code/modules/paperwork/stamps.dm index e86b0ec9756..f67021517a4 100644 --- a/code/modules/paperwork/stamps.dm +++ b/code/modules/paperwork/stamps.dm @@ -75,7 +75,12 @@ /obj/item/weapon/stamp/centcom name = "Nanotrasen Representative's rubber stamp" icon_state = "stamp-cent" - _color = "internalaffairs" + _color = "centcom" + +/obj/item/weapon/stamp/syndicate + name = "suspicious rubber stamp" + icon_state = "stamp-syndicate" + _color = "syndicate" // Syndicate stamp to forge documents. diff --git a/code/modules/research/xenoarchaeology/misc.dm b/code/modules/research/xenoarchaeology/misc.dm index 46b3f223ccb..df6628c6ae7 100644 --- a/code/modules/research/xenoarchaeology/misc.dm +++ b/code/modules/research/xenoarchaeology/misc.dm @@ -5,41 +5,39 @@ icon_state = "nboard05" /obj/structure/noticeboard/anomaly/New() + var/obj/item/weapon/stamp/rd/stamp = new //add some memos var/obj/item/weapon/paper/P = new() P.name = "Memo RE: proper analysis procedure" P.info = "
We keep test dummies in pens here for a reason, so standard procedure should be to activate newfound alien artifacts and place the two in close proximity. Promising items I might even approve monkey testing on." - P.stamped = list(/obj/item/weapon/stamp/rd) - P.overlays = list("paper_stamped_rd") + P.stamp(stamp) src.contents += P P = new() P.name = "Memo RE: materials gathering" P.info = "Corasang,
the hands-on approach to gathering our samples may very well be slow at times, but it's safer than allowing the blundering miners to roll willy-nilly over our dig sites in their mechs, destroying everything in the process. And don't forget the escavation tools on your way out there!
- R.W" - P.stamped = list(/obj/item/weapon/stamp/rd) - P.overlays = list("paper_stamped_rd") + P.stamp(stamp) src.contents += P P = new() P.name = "Memo RE: ethical quandaries" P.info = "Darion-

I don't care what his rank is, our business is that of science and knowledge - questions of moral application do not come into this. Sure, so there are those who would employ the energy-wave particles my modified device has managed to abscond for their own personal gain, but I can hardly see the practical benefits of some of these artifacts our benefactors left behind. Ward--" - P.stamped = list(/obj/item/weapon/stamp/rd) - P.overlays = list("paper_stamped_rd") + P.stamp(stamp) src.contents += P P = new() P.name = "READ ME! Before you people destroy any more samples" P.info = "how many times do i have to tell you people, these xeno-arch samples are del-i-cate, and should be handled so! careful application of a focussed, concentrated heat or some corrosive liquids should clear away the extraneous carbon matter, while application of an energy beam will most decidedly destroy it entirely - like someone did to the chemical dispenser! W, the one who signs your paychecks" - P.stamped = list(/obj/item/weapon/stamp/rd) - P.overlays = list("paper_stamped_rd") + P.stamp(stamp) src.contents += P P = new() P.name = "Reminder regarding the anomalous material suits" P.info = "Do you people think the anomaly suits are cheap to come by? I'm about a hair trigger away from instituting a log book for the damn things. Only wear them if you're going out for a dig, and for god's sake don't go tramping around in them unless you're field testing something, R" - P.stamped = list(/obj/item/weapon/stamp/rd) - P.overlays = list("paper_stamped_rd") + P.stamp(stamp) src.contents += P + + qdel(stamp) //---- Bookcase diff --git a/icons/obj/bureaucracy.dmi b/icons/obj/bureaucracy.dmi index 4385e132fcb..db997a08628 100644 Binary files a/icons/obj/bureaucracy.dmi and b/icons/obj/bureaucracy.dmi differ diff --git a/icons/paper_icons/large_stamp-syndicate.png b/icons/paper_icons/large_stamp-syndicate.png new file mode 100644 index 00000000000..bd4a99d1b89 Binary files /dev/null and b/icons/paper_icons/large_stamp-syndicate.png differ